From 081ba4b6e48f075244063cf61fd06fee64534b69 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 2 Aug 2023 07:32:42 +0200 Subject: [PATCH 1/6] Default stackableVersion to operator version --- CHANGELOG.md | 4 + Cargo.lock | 193 ++++++++++++++------------- rust/crd/Cargo.toml | 4 +- rust/crd/src/affinity.rs | 4 +- rust/crd/src/lib.rs | 6 - rust/operator-binary/Cargo.toml | 4 +- rust/operator/Cargo.toml | 2 +- rust/operator/src/hdfs_controller.rs | 5 +- rust/operator/src/lib.rs | 4 + 9 files changed, 115 insertions(+), 111 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c4b941ad..482cabf1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +### Added + +- Default stackableVersion to operator version ([#XXX]). + ## [23.7.0] - 2023-07-14 ### Added diff --git a/Cargo.lock b/Cargo.lock index bebaea33..0625b50b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -104,19 +104,19 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" [[package]] name = "async-trait" -version = "0.1.71" +version = "0.1.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" +checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.28", ] [[package]] @@ -239,11 +239,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "51f1226cd9da55587234753d1245dd5b132343ea240f26b6a9003d68706141ba" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -267,9 +268,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.11" +version = "4.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1640e5cc7fb47dbb8338fd471b105e7ed6c3cb2aeb00c2e067127ffd3764a05d" +checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" dependencies = [ "clap_builder", "clap_derive", @@ -278,9 +279,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.11" +version = "4.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98c59138d527eeaf9b53f35a77fcc1fad9d883116070c63d5de1c7dc7b00c72b" +checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" dependencies = [ "anstream", "anstyle", @@ -291,14 +292,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.2" +version = "4.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.28", ] [[package]] @@ -403,7 +404,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.25", + "syn 2.0.28", ] [[package]] @@ -425,7 +426,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.25", + "syn 2.0.28", ] [[package]] @@ -481,15 +482,15 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "dyn-clone" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" +checksum = "304e6508efa593091e97a9abbc10f90aa7ca635b6d2784feff3c89d41dd12272" [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "encoding" @@ -563,9 +564,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", @@ -678,7 +679,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.28", ] [[package]] @@ -801,9 +802,9 @@ dependencies = [ [[package]] name = "http-range-header" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" +checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" [[package]] name = "httparse" @@ -931,9 +932,9 @@ dependencies = [ [[package]] name = "indoc" -version = "2.0.2" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "761cde40c27e2a9877f8c928fd248b7eec9dd48623dd514b256858ca593fbba7" +checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4" [[package]] name = "instant" @@ -963,9 +964,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "java-properties" @@ -1073,7 +1074,7 @@ dependencies = [ "secrecy", "serde", "serde_json", - "serde_yaml 0.9.22", + "serde_yaml 0.9.25", "thiserror", "tokio", "tokio-util", @@ -1164,9 +1165,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.9" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", "libc", @@ -1191,9 +1192,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "lock_api" @@ -1264,9 +1265,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", ] @@ -1319,7 +1320,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.28", ] [[package]] @@ -1478,7 +1479,7 @@ checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.28", ] [[package]] @@ -1507,9 +1508,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.64" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -1532,9 +1533,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.29" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] @@ -1606,7 +1607,7 @@ checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.3", + "regex-automata 0.3.4", "regex-syntax 0.7.4", ] @@ -1621,9 +1622,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +checksum = "b7b6d6190b7594385f61bd3911cd1be99dfddcfc365a4160cc2ab5bff4aed294" dependencies = [ "aho-corasick", "memchr", @@ -1673,7 +1674,7 @@ dependencies = [ "regex", "relative-path", "rustc_version", - "syn 2.0.25", + "syn 2.0.28", "unicode-ident", ] @@ -1707,15 +1708,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "schemars" @@ -1743,9 +1744,9 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "secrecy" @@ -1759,18 +1760,18 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.171" +version = "1.0.180" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +checksum = "0ea67f183f058fe88a4e3ec6e2788e003840893b91bac4559cabedd00863b3ed" dependencies = [ "serde_derive", ] @@ -1787,13 +1788,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.171" +version = "1.0.180" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +checksum = "24e744d7782b686ab3b73267ef05697159cc0e5abbed3f47f9933165e5219036" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.28", ] [[package]] @@ -1809,9 +1810,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.102" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5062a995d481b2308b6064e9af76011f2921c35f97b0468811ed9f6cd91dfed" +checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" dependencies = [ "indexmap 2.0.0", "itoa", @@ -1842,9 +1843,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.22" +version = "0.9.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "452e67b9c20c37fa79df53201dc03839651086ed9bbe92b3ca585ca9fdaa7d85" +checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" dependencies = [ "indexmap 2.0.0", "itoa", @@ -1926,7 +1927,7 @@ dependencies = [ "semver", "serde", "serde_json", - "serde_yaml 0.8.26", + "serde_yaml 0.9.25", "snafu", "stackable-operator", "strum", @@ -1966,8 +1967,8 @@ dependencies = [ [[package]] name = "stackable-operator" -version = "0.44.0" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.44.0#f922369d05e709c0965098012d0fd76865004982" +version = "0.45.1" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.45.1#94141b9cd2142050e8c976d98c56c568dc85a5bd" dependencies = [ "chrono", "clap", @@ -1987,7 +1988,7 @@ dependencies = [ "schemars", "serde", "serde_json", - "serde_yaml 0.9.22", + "serde_yaml 0.9.25", "snafu", "stackable-operator-derive", "strum", @@ -2000,13 +2001,13 @@ dependencies = [ [[package]] name = "stackable-operator-derive" -version = "0.44.0" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.44.0#f922369d05e709c0965098012d0fd76865004982" +version = "0.45.1" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.45.1#94141b9cd2142050e8c976d98c56c568dc85a5bd" dependencies = [ "darling 0.20.3", "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.28", ] [[package]] @@ -2050,9 +2051,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.25" +version = "2.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" +checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" dependencies = [ "proc-macro2", "quote", @@ -2061,22 +2062,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.28", ] [[package]] @@ -2162,7 +2163,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.28", ] [[package]] @@ -2226,9 +2227,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.12" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c500344a19072298cd05a7224b3c0c629348b78692bf48466c5238656e315a78" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ "indexmap 2.0.0", "serde", @@ -2256,11 +2257,11 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8bd22a874a2d0b70452d5597b12c537331d49060824a95f49f108994f94aa4c" +checksum = "55ae70283aba8d2a8b411c695c437fe25b8b5e44e23e780662002fc72fb47a82" dependencies = [ - "base64 0.20.0", + "base64 0.21.2", "bitflags 2.3.3", "bytes", "futures-core", @@ -2308,7 +2309,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.28", ] [[package]] @@ -2399,9 +2400,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -2420,9 +2421,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "unsafe-libyaml" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6" +checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" [[package]] name = "url" @@ -2437,9 +2438,9 @@ dependencies = [ [[package]] name = "urlencoding" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "utf8parse" @@ -2501,7 +2502,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.28", "wasm-bindgen-shared", ] @@ -2523,7 +2524,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.25", + "syn 2.0.28", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2633,18 +2634,18 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.4.9" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81a2094c43cc94775293eaa0e499fbc30048a6d824ac82c0351a8c0bf9112529" +checksum = "f46aab759304e4d7b2075a9aecba26228bb073ee8c50db796b2c72c676b5d807" dependencies = [ "memchr", ] [[package]] name = "xml-rs" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a56c84a8ccd4258aed21c92f70c0f6dea75356b6892ae27c24139da456f9336" +checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1" [[package]] name = "yaml-rust" diff --git a/rust/crd/Cargo.toml b/rust/crd/Cargo.toml index e7c7649f..d2213751 100644 --- a/rust/crd/Cargo.toml +++ b/rust/crd/Cargo.toml @@ -9,7 +9,7 @@ version = "0.0.0-dev" publish = false [dependencies] -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.44.0" } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.45.1" } semver = "1.0" serde = { version = "1.0", features = ["derive"] } @@ -19,5 +19,5 @@ strum = { version = "0.24", features = ["derive"] } tracing = "0.1" [dev-dependencies] -serde_yaml = "0.8" +serde_yaml = "0.9" rstest = "0.18" diff --git a/rust/crd/src/affinity.rs b/rust/crd/src/affinity.rs index bc44b3c3..f8358bc6 100644 --- a/rust/crd/src/affinity.rs +++ b/rust/crd/src/affinity.rs @@ -56,7 +56,6 @@ metadata: spec: image: productVersion: 3.3.4 - stackableVersion: 0.2.0 clusterConfig: zookeeperConfigMapName: hdfs-zk journalNodes: @@ -144,8 +143,7 @@ metadata: spec: image: productVersion: 3.3.4 - stackableVersion: 0.2.0 - clusterConfig: + clusterConfig: zookeeperConfigMapName: hdfs-zk journalNodes: roleGroups: diff --git a/rust/crd/src/lib.rs b/rust/crd/src/lib.rs index 21d3adec..0987a023 100644 --- a/rust/crd/src/lib.rs +++ b/rust/crd/src/lib.rs @@ -1255,7 +1255,6 @@ metadata: spec: image: productVersion: 3.3.4 - stackableVersion: 0.2.0 clusterConfig: zookeeperConfigMapName: hdfs-zk dataNodes: @@ -1294,7 +1293,6 @@ metadata: spec: image: productVersion: 3.3.4 - stackableVersion: 0.2.0 clusterConfig: zookeeperConfigMapName: hdfs-zk dataNodes: @@ -1333,7 +1331,6 @@ metadata: spec: image: productVersion: 3.3.4 - stackableVersion: 0.2.0 clusterConfig: zookeeperConfigMapName: hdfs-zk dataNodes: @@ -1367,7 +1364,6 @@ metadata: spec: image: productVersion: 3.3.4 - stackableVersion: 0.2.0 clusterConfig: zookeeperConfigMapName: hdfs-zk nameNodes: @@ -1432,7 +1428,6 @@ metadata: spec: image: productVersion: 3.3.4 - stackableVersion: 0.2.0 clusterConfig: zookeeperConfigMapName: hdfs-zk dataNodes: @@ -1487,7 +1482,6 @@ metadata: spec: image: productVersion: 3.3.4 - stackableVersion: 0.2.0 clusterConfig: zookeeperConfigMapName: hdfs-zk dataNodes: diff --git a/rust/operator-binary/Cargo.toml b/rust/operator-binary/Cargo.toml index ef733d3f..7d7c0e2b 100644 --- a/rust/operator-binary/Cargo.toml +++ b/rust/operator-binary/Cargo.toml @@ -10,7 +10,7 @@ build = "build.rs" publish = false [dependencies] -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.44.0" } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.45.1" } stackable-hdfs-crd = { path = "../crd" } stackable-hdfs-operator = { path = "../operator" } anyhow = "1.0" @@ -20,7 +20,7 @@ tracing = "0.1" [build-dependencies] built = { version = "0.6", features = ["chrono", "git2"] } -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.44.0" } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.45.1" } stackable-hdfs-crd = { path = "../crd" } [[bin]] diff --git a/rust/operator/Cargo.toml b/rust/operator/Cargo.toml index bf202773..de6ae416 100644 --- a/rust/operator/Cargo.toml +++ b/rust/operator/Cargo.toml @@ -9,7 +9,7 @@ version = "0.0.0-dev" publish = false [dependencies] -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.44.0" } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.45.1" } stackable-hdfs-crd = { path = "../crd" } futures = "0.3" diff --git a/rust/operator/src/hdfs_controller.rs b/rust/operator/src/hdfs_controller.rs index 23462bdf..380abbca 100644 --- a/rust/operator/src/hdfs_controller.rs +++ b/rust/operator/src/hdfs_controller.rs @@ -179,7 +179,10 @@ pub async fn reconcile_hdfs(hdfs: Arc, ctx: Arc) -> HdfsOperat tracing::info!("Starting reconcile"); let client = &ctx.client; - let resolved_product_image = hdfs.spec.image.resolve(DOCKER_IMAGE_BASE_NAME); + let resolved_product_image = hdfs + .spec + .image + .resolve(DOCKER_IMAGE_BASE_NAME, crate::built_info::CARGO_PKG_VERSION); if hdfs.has_kerberos_enabled() { kerberos::check_if_supported(&resolved_product_image)?; } diff --git a/rust/operator/src/lib.rs b/rust/operator/src/lib.rs index 52e06d0c..4f71b594 100644 --- a/rust/operator/src/lib.rs +++ b/rust/operator/src/lib.rs @@ -27,6 +27,10 @@ use tracing_futures::Instrument; pub const OPERATOR_NAME: &str = "hdfs.stackable.tech"; +mod built_info { + pub const CARGO_PKG_VERSION: &str = env!("CARGO_PKG_VERSION"); +} + pub async fn create_controller( client: Client, product_config: ProductConfigManager, From 2cdfa331555a545df43d93a45f104cf8d8ca36e9 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 2 Aug 2023 07:45:07 +0200 Subject: [PATCH 2/6] update docs and tests --- docs/modules/hdfs/examples/getting_started/hdfs.yaml | 1 - docs/modules/hdfs/examples/getting_started/hdfs.yaml.j2 | 1 - docs/modules/hdfs/examples/getting_started/zk.yaml | 1 - docs/modules/hdfs/examples/getting_started/zk.yaml.j2 | 1 - tests/templates/kuttl/cluster-operation/10-install-zk.yaml.j2 | 3 +-- .../templates/kuttl/cluster-operation/20-install-hdfs.yaml.j2 | 3 +-- tests/templates/kuttl/cluster-operation/30-stop-hdfs.yaml.j2 | 3 +-- tests/templates/kuttl/cluster-operation/40-pause-hdfs.yaml.j2 | 3 +-- .../templates/kuttl/cluster-operation/50-restart-hdfs.yaml.j2 | 3 +-- tests/templates/kuttl/kerberos/10-install-zk.yaml.j2 | 3 +-- tests/templates/kuttl/kerberos/11-install-hdfs.yaml.j2 | 3 +-- tests/templates/kuttl/logging/02-install-zookeeper.yaml.j2 | 3 +-- .../kuttl/logging/03-install-hdfs-automatic-log.yaml.j2 | 3 +-- .../templates/kuttl/logging/04-install-hdfs-custom-log.yaml.j2 | 3 +-- .../kuttl/orphaned-resources/01-install-zookeeper.yaml.j2 | 3 +-- .../templates/kuttl/orphaned-resources/02-install-hdfs.yaml.j2 | 3 +-- .../kuttl/orphaned-resources/03-remove-datanode.yaml.j2 | 3 +-- tests/templates/kuttl/smoke/20-install-zk.yaml.j2 | 3 +-- tests/templates/kuttl/smoke/30-install-hdfs.yaml.j2 | 3 +-- 19 files changed, 15 insertions(+), 34 deletions(-) diff --git a/docs/modules/hdfs/examples/getting_started/hdfs.yaml b/docs/modules/hdfs/examples/getting_started/hdfs.yaml index 19122d8c..86066120 100644 --- a/docs/modules/hdfs/examples/getting_started/hdfs.yaml +++ b/docs/modules/hdfs/examples/getting_started/hdfs.yaml @@ -6,7 +6,6 @@ metadata: spec: image: productVersion: 3.3.4 - stackableVersion: 0.0.0-dev clusterConfig: zookeeperConfigMapName: simple-hdfs-znode listenerClass: external-unstable diff --git a/docs/modules/hdfs/examples/getting_started/hdfs.yaml.j2 b/docs/modules/hdfs/examples/getting_started/hdfs.yaml.j2 index 5bdf64a5..86066120 100644 --- a/docs/modules/hdfs/examples/getting_started/hdfs.yaml.j2 +++ b/docs/modules/hdfs/examples/getting_started/hdfs.yaml.j2 @@ -6,7 +6,6 @@ metadata: spec: image: productVersion: 3.3.4 - stackableVersion: {{ versions.hdfs }} clusterConfig: zookeeperConfigMapName: simple-hdfs-znode listenerClass: external-unstable diff --git a/docs/modules/hdfs/examples/getting_started/zk.yaml b/docs/modules/hdfs/examples/getting_started/zk.yaml index 60264116..3684c21a 100644 --- a/docs/modules/hdfs/examples/getting_started/zk.yaml +++ b/docs/modules/hdfs/examples/getting_started/zk.yaml @@ -6,7 +6,6 @@ metadata: spec: image: productVersion: 3.8.0 - stackableVersion: 0.0.0-dev servers: roleGroups: default: diff --git a/docs/modules/hdfs/examples/getting_started/zk.yaml.j2 b/docs/modules/hdfs/examples/getting_started/zk.yaml.j2 index 80d549f7..3684c21a 100644 --- a/docs/modules/hdfs/examples/getting_started/zk.yaml.j2 +++ b/docs/modules/hdfs/examples/getting_started/zk.yaml.j2 @@ -6,7 +6,6 @@ metadata: spec: image: productVersion: 3.8.0 - stackableVersion: {{ versions.zookeeper }} servers: roleGroups: default: diff --git a/tests/templates/kuttl/cluster-operation/10-install-zk.yaml.j2 b/tests/templates/kuttl/cluster-operation/10-install-zk.yaml.j2 index 6be5ec9d..7d45cb34 100644 --- a/tests/templates/kuttl/cluster-operation/10-install-zk.yaml.j2 +++ b/tests/templates/kuttl/cluster-operation/10-install-zk.yaml.j2 @@ -5,8 +5,7 @@ metadata: name: hdfs-zk spec: image: - productVersion: "{{ test_scenario['values']['zookeeper-latest'].split('-stackable')[0] }}" - stackableVersion: "{{ test_scenario['values']['zookeeper-latest'].split('-stackable')[1] }}" + productVersion: "{{ test_scenario['values']['zookeeper-latest'] }}" {% if lookup('env', 'VECTOR_AGGREGATOR') %} clusterConfig: logging: diff --git a/tests/templates/kuttl/cluster-operation/20-install-hdfs.yaml.j2 b/tests/templates/kuttl/cluster-operation/20-install-hdfs.yaml.j2 index 8d31f7ea..3fbbbd28 100644 --- a/tests/templates/kuttl/cluster-operation/20-install-hdfs.yaml.j2 +++ b/tests/templates/kuttl/cluster-operation/20-install-hdfs.yaml.j2 @@ -9,8 +9,7 @@ metadata: name: hdfs spec: image: - productVersion: "{{ test_scenario['values']['hadoop-latest'].split('-stackable')[0] }}" - stackableVersion: "{{ test_scenario['values']['hadoop-latest'].split('-stackable')[1] }}" + productVersion: "{{ test_scenario['values']['hadoop-latest'] }}" clusterConfig: dfsReplication: 1 zookeeperConfigMapName: hdfs-zk diff --git a/tests/templates/kuttl/cluster-operation/30-stop-hdfs.yaml.j2 b/tests/templates/kuttl/cluster-operation/30-stop-hdfs.yaml.j2 index 2958a4c5..e73bf1d3 100644 --- a/tests/templates/kuttl/cluster-operation/30-stop-hdfs.yaml.j2 +++ b/tests/templates/kuttl/cluster-operation/30-stop-hdfs.yaml.j2 @@ -9,8 +9,7 @@ metadata: name: hdfs spec: image: - productVersion: "{{ test_scenario['values']['hadoop-latest'].split('-stackable')[0] }}" - stackableVersion: "{{ test_scenario['values']['hadoop-latest'].split('-stackable')[1] }}" + productVersion: "{{ test_scenario['values']['hadoop-latest'] }}" clusterConfig: dfsReplication: 1 zookeeperConfigMapName: hdfs-zk diff --git a/tests/templates/kuttl/cluster-operation/40-pause-hdfs.yaml.j2 b/tests/templates/kuttl/cluster-operation/40-pause-hdfs.yaml.j2 index 35a8cc52..084a2628 100644 --- a/tests/templates/kuttl/cluster-operation/40-pause-hdfs.yaml.j2 +++ b/tests/templates/kuttl/cluster-operation/40-pause-hdfs.yaml.j2 @@ -9,8 +9,7 @@ metadata: name: hdfs spec: image: - productVersion: "{{ test_scenario['values']['hadoop-latest'].split('-stackable')[0] }}" - stackableVersion: "{{ test_scenario['values']['hadoop-latest'].split('-stackable')[1] }}" + productVersion: "{{ test_scenario['values']['hadoop-latest'] }}" clusterConfig: dfsReplication: 1 zookeeperConfigMapName: hdfs-zk diff --git a/tests/templates/kuttl/cluster-operation/50-restart-hdfs.yaml.j2 b/tests/templates/kuttl/cluster-operation/50-restart-hdfs.yaml.j2 index 8d31f7ea..3fbbbd28 100644 --- a/tests/templates/kuttl/cluster-operation/50-restart-hdfs.yaml.j2 +++ b/tests/templates/kuttl/cluster-operation/50-restart-hdfs.yaml.j2 @@ -9,8 +9,7 @@ metadata: name: hdfs spec: image: - productVersion: "{{ test_scenario['values']['hadoop-latest'].split('-stackable')[0] }}" - stackableVersion: "{{ test_scenario['values']['hadoop-latest'].split('-stackable')[1] }}" + productVersion: "{{ test_scenario['values']['hadoop-latest'] }}" clusterConfig: dfsReplication: 1 zookeeperConfigMapName: hdfs-zk diff --git a/tests/templates/kuttl/kerberos/10-install-zk.yaml.j2 b/tests/templates/kuttl/kerberos/10-install-zk.yaml.j2 index 22ea2f13..cab1dd25 100644 --- a/tests/templates/kuttl/kerberos/10-install-zk.yaml.j2 +++ b/tests/templates/kuttl/kerberos/10-install-zk.yaml.j2 @@ -5,8 +5,7 @@ metadata: name: hdfs-zk spec: image: - productVersion: "{{ test_scenario['values']['zookeeper-latest'].split('-stackable')[0] }}" - stackableVersion: "{{ test_scenario['values']['zookeeper-latest'].split('-stackable')[1] }}" + productVersion: "{{ test_scenario['values']['zookeeper-latest'] }}" clusterConfig: {% if lookup('env', 'VECTOR_AGGREGATOR') %} logging: diff --git a/tests/templates/kuttl/kerberos/11-install-hdfs.yaml.j2 b/tests/templates/kuttl/kerberos/11-install-hdfs.yaml.j2 index e223808e..54dafa4a 100644 --- a/tests/templates/kuttl/kerberos/11-install-hdfs.yaml.j2 +++ b/tests/templates/kuttl/kerberos/11-install-hdfs.yaml.j2 @@ -11,8 +11,7 @@ commands: name: hdfs spec: image: - productVersion: "{{ test_scenario['values']['hadoop-latest'].split('-stackable')[0] }}" - stackableVersion: "{{ test_scenario['values']['hadoop-latest'].split('-stackable')[1] }}" + productVersion: "{{ test_scenario['values']['hadoop-latest'] }}" clusterConfig: zookeeperConfigMapName: hdfs-zk dfsReplication: 1 diff --git a/tests/templates/kuttl/logging/02-install-zookeeper.yaml.j2 b/tests/templates/kuttl/logging/02-install-zookeeper.yaml.j2 index 1d30cb2d..87160621 100644 --- a/tests/templates/kuttl/logging/02-install-zookeeper.yaml.j2 +++ b/tests/templates/kuttl/logging/02-install-zookeeper.yaml.j2 @@ -5,8 +5,7 @@ metadata: name: test-zk spec: image: - productVersion: "{{ test_scenario['values']['zookeeper-latest'].split('-stackable')[0] }}" - stackableVersion: "{{ test_scenario['values']['zookeeper-latest'].split('-stackable')[1] }}" + productVersion: "{{ test_scenario['values']['zookeeper-latest'] }}" {% if lookup('env', 'VECTOR_AGGREGATOR') %} clusterConfig: logging: diff --git a/tests/templates/kuttl/logging/03-install-hdfs-automatic-log.yaml.j2 b/tests/templates/kuttl/logging/03-install-hdfs-automatic-log.yaml.j2 index 2c9bd68f..3055b342 100644 --- a/tests/templates/kuttl/logging/03-install-hdfs-automatic-log.yaml.j2 +++ b/tests/templates/kuttl/logging/03-install-hdfs-automatic-log.yaml.j2 @@ -5,8 +5,7 @@ metadata: name: test-hdfs-automatic-log spec: image: - productVersion: "{{ test_scenario['values']['hadoop'].split('-stackable')[0] }}" - stackableVersion: "{{ test_scenario['values']['hadoop'].split('-stackable')[1] }}" + productVersion: "{{ test_scenario['values']['hadoop'] }}" clusterConfig: vectorAggregatorConfigMapName: hdfs-vector-aggregator-discovery zookeeperConfigMapName: test-hdfs-automatic-log-znode diff --git a/tests/templates/kuttl/logging/04-install-hdfs-custom-log.yaml.j2 b/tests/templates/kuttl/logging/04-install-hdfs-custom-log.yaml.j2 index 8f4edfd1..2286e9a5 100644 --- a/tests/templates/kuttl/logging/04-install-hdfs-custom-log.yaml.j2 +++ b/tests/templates/kuttl/logging/04-install-hdfs-custom-log.yaml.j2 @@ -60,8 +60,7 @@ metadata: name: test-hdfs-custom-log spec: image: - productVersion: "{{ test_scenario['values']['hadoop'].split('-stackable')[0] }}" - stackableVersion: "{{ test_scenario['values']['hadoop'].split('-stackable')[1] }}" + productVersion: "{{ test_scenario['values']['hadoop'] }}" clusterConfig: vectorAggregatorConfigMapName: hdfs-vector-aggregator-discovery zookeeperConfigMapName: test-hdfs-custom-log-znode diff --git a/tests/templates/kuttl/orphaned-resources/01-install-zookeeper.yaml.j2 b/tests/templates/kuttl/orphaned-resources/01-install-zookeeper.yaml.j2 index 87e423b7..027433b1 100644 --- a/tests/templates/kuttl/orphaned-resources/01-install-zookeeper.yaml.j2 +++ b/tests/templates/kuttl/orphaned-resources/01-install-zookeeper.yaml.j2 @@ -5,8 +5,7 @@ metadata: name: test-zk spec: image: - productVersion: "{{ test_scenario['values']['zookeeper-latest'].split('-stackable')[0] }}" - stackableVersion: "{{ test_scenario['values']['zookeeper-latest'].split('-stackable')[1] }}" + productVersion: "{{ test_scenario['values']['zookeeper-latest'] }}" {% if lookup('env', 'VECTOR_AGGREGATOR') %} clusterConfig: logging: diff --git a/tests/templates/kuttl/orphaned-resources/02-install-hdfs.yaml.j2 b/tests/templates/kuttl/orphaned-resources/02-install-hdfs.yaml.j2 index b1e1975e..6503a067 100644 --- a/tests/templates/kuttl/orphaned-resources/02-install-hdfs.yaml.j2 +++ b/tests/templates/kuttl/orphaned-resources/02-install-hdfs.yaml.j2 @@ -5,8 +5,7 @@ metadata: name: test-hdfs spec: image: - productVersion: "{{ test_scenario['values']['hadoop-latest'].split('-stackable')[0] }}" - stackableVersion: "{{ test_scenario['values']['hadoop-latest'].split('-stackable')[1] }}" + productVersion: "{{ test_scenario['values']['hadoop-latest'] }}" clusterConfig: dfsReplication: 1 zookeeperConfigMapName: test-znode diff --git a/tests/templates/kuttl/orphaned-resources/03-remove-datanode.yaml.j2 b/tests/templates/kuttl/orphaned-resources/03-remove-datanode.yaml.j2 index 82c5a40c..99de4d38 100644 --- a/tests/templates/kuttl/orphaned-resources/03-remove-datanode.yaml.j2 +++ b/tests/templates/kuttl/orphaned-resources/03-remove-datanode.yaml.j2 @@ -5,8 +5,7 @@ metadata: name: test-hdfs spec: image: - productVersion: "{{ test_scenario['values']['hadoop-latest'].split('-stackable')[0] }}" - stackableVersion: "{{ test_scenario['values']['hadoop-latest'].split('-stackable')[1] }}" + productVersion: "{{ test_scenario['values']['hadoop-latest'] }}" clusterConfig: dfsReplication: 1 zookeeperConfigMapName: test-znode diff --git a/tests/templates/kuttl/smoke/20-install-zk.yaml.j2 b/tests/templates/kuttl/smoke/20-install-zk.yaml.j2 index e4c5db96..41164302 100644 --- a/tests/templates/kuttl/smoke/20-install-zk.yaml.j2 +++ b/tests/templates/kuttl/smoke/20-install-zk.yaml.j2 @@ -5,8 +5,7 @@ metadata: name: hdfs-zk spec: image: - productVersion: "{{ test_scenario['values']['zookeeper'].split('-stackable')[0] }}" - stackableVersion: "{{ test_scenario['values']['zookeeper'].split('-stackable')[1] }}" + productVersion: "{{ test_scenario['values']['zookeeper'] }}" clusterConfig: listenerClass: {{ test_scenario['values']['listener-class'] }} {% if lookup('env', 'VECTOR_AGGREGATOR') %} diff --git a/tests/templates/kuttl/smoke/30-install-hdfs.yaml.j2 b/tests/templates/kuttl/smoke/30-install-hdfs.yaml.j2 index c1875c69..96837878 100644 --- a/tests/templates/kuttl/smoke/30-install-hdfs.yaml.j2 +++ b/tests/templates/kuttl/smoke/30-install-hdfs.yaml.j2 @@ -11,8 +11,7 @@ metadata: name: hdfs spec: image: - productVersion: "{{ test_scenario['values']['hadoop'].split('-stackable')[0] }}" - stackableVersion: "{{ test_scenario['values']['hadoop'].split('-stackable')[1] }}" + productVersion: "{{ test_scenario['values']['hadoop'] }}" clusterConfig: zookeeperConfigMapName: hdfs-zk dfsReplication: 1 From c03f122c3945b8696dc6ccb6f08f8fc14ffce5a2 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 2 Aug 2023 07:47:30 +0200 Subject: [PATCH 3/6] charts --- deploy/helm/hdfs-operator/crds/crds.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy/helm/hdfs-operator/crds/crds.yaml b/deploy/helm/hdfs-operator/crds/crds.yaml index 1fee4726..c4280747 100644 --- a/deploy/helm/hdfs-operator/crds/crds.yaml +++ b/deploy/helm/hdfs-operator/crds/crds.yaml @@ -7009,7 +7009,6 @@ spec: - productVersion - required: - productVersion - - stackableVersion properties: custom: description: Overwrite the docker image. Specify the full docker image name, e.g. `docker.stackable.tech/stackable/superset:1.4.1-stackable2.1.0` @@ -7018,7 +7017,7 @@ spec: description: Version of the product, e.g. `1.4.1`. type: string pullPolicy: - default: IfNotPresent + default: Always description: '[Pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) used when pulling the Images' enum: - IfNotPresent @@ -7041,7 +7040,8 @@ spec: nullable: true type: string stackableVersion: - description: Stackable version of the product, e.g. 2.1.0 + description: Stackable version of the product, e.g. `23.4`, `23.4.1` or `0.0.0-dev`. If not specified, the operator will use its own version, e.g. `23.4.1`. When using a nightly operator or a pr version, it will use the nightly `0.0.0-dev` image. + nullable: true type: string type: object journalNodes: From 19aba36cb5b2882c16d5b99780079498b926efbe Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 2 Aug 2023 07:49:39 +0200 Subject: [PATCH 4/6] changelog --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 482cabf1..1001314c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,9 @@ All notable changes to this project will be documented in this file. ### Added -- Default stackableVersion to operator version ([#XXX]). +- Default stackableVersion to operator version ([#381]). + +[#381]: https://github.com/stackabletech/hdfs-operator/pull/381 ## [23.7.0] - 2023-07-14 From 216092812813b537172cf4ade892e5108741ecad Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 2 Aug 2023 08:11:23 +0200 Subject: [PATCH 5/6] fix tests --- tests/test-definition.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml index 940b0cc5..35520d03 100644 --- a/tests/test-definition.yaml +++ b/tests/test-definition.yaml @@ -2,17 +2,17 @@ dimensions: - name: hadoop values: - - 3.2.2-stackable0.0.0-dev - - 3.3.4-stackable0.0.0-dev + - 3.2.2 + - 3.3.4 - name: hadoop-latest values: - - 3.3.4-stackable0.0.0-dev + - 3.3.4 - name: zookeeper values: - - 3.8.0-stackable0.0.0-dev + - 3.8.0 - name: zookeeper-latest values: - - 3.8.0-stackable0.0.0-dev + - 3.8.0 - name: number-of-datanodes values: - "1" From 7f1274b04a47014c58784007128ab6343ab72faa Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 2 Aug 2023 11:41:04 +0200 Subject: [PATCH 6/6] trigger ci