From 6aa311bedff6c36e52d1b40b96b80a0154f46209 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 2 Aug 2023 14:13:45 +0200 Subject: [PATCH 1/6] feat: Default stackableVersion to operator version --- CHANGELOG.md | 4 + Cargo.lock | 332 +++++++++--------- .../getting_started/getting_started.sh | 2 - .../getting_started/getting_started.sh.j2 | 2 - .../pages/usage_guide/custom_processors.adoc | 1 - .../modules/nifi/pages/usage_guide/index.adoc | 1 - .../nifi/pages/usage_guide/updating.adoc | 1 - examples/simple-nifi-cluster.yaml | 2 - rust/crd/Cargo.toml | 2 +- rust/crd/src/affinity.rs | 2 - rust/operator-binary/Cargo.toml | 4 +- rust/operator-binary/src/controller.rs | 6 +- rust/operator-binary/src/main.rs | 1 + .../cluster_operation/10-install-zk.yaml.j2 | 3 +- .../cluster_operation/20-install-nifi.yaml.j2 | 3 +- .../cluster_operation/30-stop-nifi.yaml.j2 | 3 +- .../cluster_operation/40-pause-nifi.yaml.j2 | 3 +- .../cluster_operation/50-restart-nifi.yaml.j2 | 3 +- .../kuttl/ldap/10-install-zk.yaml.j2 | 3 +- .../kuttl/ldap/12-install-nifi.yaml.j2 | 3 +- .../logging/02-install-zookeeper.yaml.j2 | 3 +- .../kuttl/logging/03-install-nifi.yaml.j2 | 3 +- .../orphaned_resources/01-install-zk.yaml.j2 | 3 +- .../02-install-nifi.yaml.j2 | 3 +- .../kuttl/resources/01-install-zk.yaml.j2 | 3 +- .../kuttl/resources/02-install-nifi.yaml.j2 | 3 +- .../kuttl/smoke/20-install-zk.yaml.j2 | 3 +- .../kuttl/smoke/30-install-nifi.yaml.j2 | 3 +- .../kuttl/upgrade/01-install-zk.yaml.j2 | 3 +- .../kuttl/upgrade/02-install-nifi.yaml.j2 | 3 +- .../kuttl/upgrade/05-upgrade-nifi.yaml.j2 | 3 +- tests/test-definition.yaml | 22 +- 32 files changed, 202 insertions(+), 234 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index df93437c..26694364 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 f75dc55f..561e766c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" dependencies = [ "gimli", ] @@ -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.68" +version = "0.1.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.28", ] [[package]] @@ -138,9 +138,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" dependencies = [ "addr2line", "cc", @@ -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.9" +version = "4.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bba77a07e4489fb41bd90e8d4201c3eb246b3c2c9ea2ba0bddd6c1d1df87db7d" +checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" dependencies = [ "clap_builder", "clap_derive", @@ -278,13 +279,12 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.9" +version = "4.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9b4a88bb4bc35d3d6f65a21b0f0bafe9c894fa00978de242c555ec28bea1c0" +checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" dependencies = [ "anstream", "anstyle", - "bitflags 1.3.2", "clap_lex", "once_cell", "strsim", @@ -292,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.22", + "syn 2.0.28", ] [[package]] @@ -371,12 +371,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.1" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" dependencies = [ - "darling_core 0.20.1", - "darling_macro 0.20.1", + "darling_core 0.20.3", + "darling_macro 0.20.3", ] [[package]] @@ -395,16 +395,16 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.1" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.22", + "syn 2.0.28", ] [[package]] @@ -420,23 +420,23 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.1" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ - "darling_core 0.20.1", + "darling_core 0.20.3", "quote", - "syn 2.0.22", + "syn 2.0.28", ] [[package]] name = "dashmap" -version = "5.4.0" +version = "5.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" +checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d" dependencies = [ "cfg-if", - "hashbrown 0.12.3", + "hashbrown 0.14.0", "lock_api", "once_cell", "parking_lot_core", @@ -482,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" @@ -558,15 +558,15 @@ checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" [[package]] name = "equivalent" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" +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", @@ -685,7 +685,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.28", ] [[package]] @@ -769,18 +769,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "http" @@ -806,9 +797,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" @@ -936,9 +927,9 @@ dependencies = [ [[package]] name = "indoc" -version = "2.0.1" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f2cb48b81b1dc9f39676bf99f5499babfec7cd8fe14307f7b3d747208fb5690" +checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4" [[package]] name = "instant" @@ -955,34 +946,22 @@ version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys", -] - [[package]] name = "is-terminal" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", + "hermit-abi", "rustix", "windows-sys", ] [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "java-properties" @@ -1090,7 +1069,7 @@ dependencies = [ "secrecy", "serde", "serde_json", - "serde_yaml 0.9.22", + "serde_yaml 0.9.25", "thiserror", "tokio", "tokio-util", @@ -1181,9 +1160,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", @@ -1208,9 +1187,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "lock_api" @@ -1234,7 +1213,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ - "regex-automata", + "regex-automata 0.1.10", ] [[package]] @@ -1251,9 +1230,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", ] @@ -1281,28 +1260,28 @@ 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", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "libc", ] [[package]] name = "object" -version = "0.30.4" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" dependencies = [ "memchr", ] @@ -1336,7 +1315,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.28", ] [[package]] @@ -1480,29 +1459,29 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pin-project" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.28", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" [[package]] name = "pin-utils" @@ -1524,9 +1503,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.63" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -1549,9 +1528,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", ] @@ -1617,13 +1596,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.4" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.2", + "regex-automata 0.3.4", + "regex-syntax 0.7.4", ] [[package]] @@ -1635,6 +1615,17 @@ dependencies = [ "regex-syntax 0.6.29", ] +[[package]] +name = "regex-automata" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7b6d6190b7594385f61bd3911cd1be99dfddcfc365a4160cc2ab5bff4aed294" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.4", +] + [[package]] name = "regex-syntax" version = "0.6.29" @@ -1643,9 +1634,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "rustc-demangle" @@ -1655,13 +1646,12 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustix" -version = "0.37.20" +version = "0.38.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" +checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.3.3", "errno", - "io-lifetimes", "libc", "linux-raw-sys", "windows-sys", @@ -1669,15 +1659,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "schemars" @@ -1705,9 +1695,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" @@ -1721,18 +1711,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.164" +version = "1.0.180" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +checksum = "0ea67f183f058fe88a4e3ec6e2788e003840893b91bac4559cabedd00863b3ed" dependencies = [ "serde_derive", ] @@ -1749,13 +1739,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.164" +version = "1.0.180" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +checksum = "24e744d7782b686ab3b73267ef05697159cc0e5abbed3f47f9933165e5219036" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.28", ] [[package]] @@ -1771,9 +1761,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.99" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3" +checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" dependencies = [ "indexmap 2.0.0", "itoa", @@ -1804,9 +1794,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", @@ -1844,15 +1834,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "snafu" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0656e7e3ffb70f6c39b3c2a86332bb74aa3c679da781642590f3c1118c5045" +checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6" dependencies = [ "doc-comment", "snafu-derive", @@ -1860,9 +1850,9 @@ dependencies = [ [[package]] name = "snafu-derive" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "475b3bbe5245c26f2d8a6f62d67c1f30eb9fffeccee721c45d162c3ebbdf81b2" +checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" dependencies = [ "heck", "proc-macro2", @@ -1888,7 +1878,7 @@ dependencies = [ "rand", "serde", "serde_json", - "serde_yaml 0.9.22", + "serde_yaml 0.9.25", "snafu", "stackable-operator", "strum", @@ -1920,8 +1910,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", @@ -1941,7 +1931,7 @@ dependencies = [ "schemars", "serde", "serde_json", - "serde_yaml 0.9.22", + "serde_yaml 0.9.25", "snafu", "stackable-operator-derive", "strum", @@ -1954,13 +1944,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.1", + "darling 0.20.3", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.28", ] [[package]] @@ -2004,9 +1994,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.22" +version = "2.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2efbeae7acf4eabd6bcdcbd11c92f45231ddda7539edc7806bd1a04a03b24616" +checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" dependencies = [ "proc-macro2", "quote", @@ -2015,22 +2005,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.28", ] [[package]] @@ -2082,9 +2072,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.29.0" +version = "1.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374442f06ee49c3a28a8fc9f01a2596fed7559c6b99b31279c3261778e77d84f" +checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" dependencies = [ "autocfg", "backtrace", @@ -2118,7 +2108,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.28", ] [[package]] @@ -2161,9 +2151,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" dependencies = [ "serde", "serde_spanned", @@ -2182,9 +2172,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.11" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ "indexmap 2.0.0", "serde", @@ -2212,11 +2202,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", @@ -2264,7 +2254,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.28", ] [[package]] @@ -2343,9 +2333,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -2364,9 +2354,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" @@ -2381,9 +2371,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" @@ -2445,7 +2435,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.28", "wasm-bindgen-shared", ] @@ -2467,7 +2457,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.22", + "syn 2.0.28", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2577,18 +2567,18 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.4.7" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448" +checksum = "f46aab759304e4d7b2075a9aecba26228bb073ee8c50db796b2c72c676b5d807" dependencies = [ "memchr", ] [[package]] name = "xml-rs" -version = "0.8.14" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52839dc911083a8ef63efa4d039d1f58b5e409f923e44c80828f206f66e5541c" +checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1" [[package]] name = "yaml-rust" diff --git a/docs/modules/nifi/examples/getting_started/getting_started.sh b/docs/modules/nifi/examples/getting_started/getting_started.sh index f2b5cf02..85ae81c8 100755 --- a/docs/modules/nifi/examples/getting_started/getting_started.sh +++ b/docs/modules/nifi/examples/getting_started/getting_started.sh @@ -80,7 +80,6 @@ metadata: spec: image: productVersion: 3.8.0 - stackableVersion: "0.0.0-dev" servers: roleGroups: default: @@ -134,7 +133,6 @@ metadata: spec: image: productVersion: 1.21.0 - stackableVersion: "0.0.0-dev" clusterConfig: authentication: method: diff --git a/docs/modules/nifi/examples/getting_started/getting_started.sh.j2 b/docs/modules/nifi/examples/getting_started/getting_started.sh.j2 index 73cffd24..fff94313 100755 --- a/docs/modules/nifi/examples/getting_started/getting_started.sh.j2 +++ b/docs/modules/nifi/examples/getting_started/getting_started.sh.j2 @@ -80,7 +80,6 @@ metadata: spec: image: productVersion: 3.8.0 - stackableVersion: "{{ versions.zookeeper }}" servers: roleGroups: default: @@ -134,7 +133,6 @@ metadata: spec: image: productVersion: 1.21.0 - stackableVersion: "{{ versions.nifi }}" clusterConfig: authentication: method: diff --git a/docs/modules/nifi/pages/usage_guide/custom_processors.adoc b/docs/modules/nifi/pages/usage_guide/custom_processors.adoc index bdbdc567..8f04abaa 100644 --- a/docs/modules/nifi/pages/usage_guide/custom_processors.adoc +++ b/docs/modules/nifi/pages/usage_guide/custom_processors.adoc @@ -97,7 +97,6 @@ metadata: spec: image: productVersion: 1.21.0 - stackableVersion: "0.0.0-dev" clusterConfig: extraVolumes: # <1> - name: nifi-processor diff --git a/docs/modules/nifi/pages/usage_guide/index.adoc b/docs/modules/nifi/pages/usage_guide/index.adoc index c88f4ee8..daa1540a 100644 --- a/docs/modules/nifi/pages/usage_guide/index.adoc +++ b/docs/modules/nifi/pages/usage_guide/index.adoc @@ -14,7 +14,6 @@ metadata: spec: image: productVersion: 1.21.0 - stackableVersion: "0.0.0-dev" clusterConfig: zookeeperConfigMapName: simple-nifi-znode # <1> authentication: # <2> diff --git a/docs/modules/nifi/pages/usage_guide/updating.adoc b/docs/modules/nifi/pages/usage_guide/updating.adoc index 411297c7..c2692f10 100644 --- a/docs/modules/nifi/pages/usage_guide/updating.adoc +++ b/docs/modules/nifi/pages/usage_guide/updating.adoc @@ -12,7 +12,6 @@ metadata: spec: image: productVersion: 1.20.0 # <1> - stackableVersion: "0.0.0-dev" # <2> clusterConfig: authentication: method: diff --git a/examples/simple-nifi-cluster.yaml b/examples/simple-nifi-cluster.yaml index 738662d2..a7cd725a 100644 --- a/examples/simple-nifi-cluster.yaml +++ b/examples/simple-nifi-cluster.yaml @@ -8,7 +8,6 @@ metadata: spec: image: productVersion: 3.8.0 - stackableVersion: "0.0.0-dev" servers: roleGroups: default: @@ -37,7 +36,6 @@ metadata: spec: image: productVersion: 1.21.0 - stackableVersion: "0.0.0-dev" clusterConfig: authentication: method: diff --git a/rust/crd/Cargo.toml b/rust/crd/Cargo.toml index d63fd9a6..351be3f2 100644 --- a/rust/crd/Cargo.toml +++ b/rust/crd/Cargo.toml @@ -15,7 +15,7 @@ serde = "1.0" serde_json = "1.0" snafu = "0.7" rand = "0.8" -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" } strum = { version = "0.24", features = ["derive"] } tracing = "0.1" diff --git a/rust/crd/src/affinity.rs b/rust/crd/src/affinity.rs index 1637adbc..80170727 100644 --- a/rust/crd/src/affinity.rs +++ b/rust/crd/src/affinity.rs @@ -47,7 +47,6 @@ mod tests { spec: image: productVersion: 1.18.0 - stackableVersion: "23.1" clusterConfig: authentication: method: @@ -115,7 +114,6 @@ mod tests { spec: image: productVersion: 1.18.0 - stackableVersion: "23.1" clusterConfig: authentication: method: diff --git a/rust/operator-binary/Cargo.toml b/rust/operator-binary/Cargo.toml index 9bd0f0fa..c0ade0bd 100644 --- a/rust/operator-binary/Cargo.toml +++ b/rust/operator-binary/Cargo.toml @@ -20,7 +20,7 @@ semver = "1.0" serde = "1.0" serde_json = "1.0" snafu = "0.7" -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-nifi-crd = { path = "../crd" } strum = { version = "0.24", features = ["derive"] } tokio = { version = "1.25", features = ["full"] } @@ -28,5 +28,5 @@ 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-nifi-crd = { path = "../crd" } diff --git a/rust/operator-binary/src/controller.rs b/rust/operator-binary/src/controller.rs index b4340f39..a90d86b6 100644 --- a/rust/operator-binary/src/controller.rs +++ b/rust/operator-binary/src/controller.rs @@ -240,8 +240,10 @@ pub async fn reconcile_nifi(nifi: Arc, ctx: Arc) -> Result = option_env!("TARGET"); + pub const CARGO_PKG_VERSION: &str = env!("CARGO_PKG_VERSION"); } #[derive(Parser)] 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 17ebd932..3d808a3c 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: 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/cluster_operation/20-install-nifi.yaml.j2 b/tests/templates/kuttl/cluster_operation/20-install-nifi.yaml.j2 index 05ff275c..13e71c68 100644 --- a/tests/templates/kuttl/cluster_operation/20-install-nifi.yaml.j2 +++ b/tests/templates/kuttl/cluster_operation/20-install-nifi.yaml.j2 @@ -20,8 +20,7 @@ metadata: name: test-nifi spec: image: - productVersion: "{{ test_scenario['values']['nifi-latest'].split('-stackable')[0] }}" - stackableVersion: "{{ test_scenario['values']['nifi-latest'].split('-stackable')[1] }}" + productVersion: "{{ test_scenario['values']['nifi-latest'] }}" clusterConfig: authentication: method: diff --git a/tests/templates/kuttl/cluster_operation/30-stop-nifi.yaml.j2 b/tests/templates/kuttl/cluster_operation/30-stop-nifi.yaml.j2 index 1add51f5..9eb9ed3b 100644 --- a/tests/templates/kuttl/cluster_operation/30-stop-nifi.yaml.j2 +++ b/tests/templates/kuttl/cluster_operation/30-stop-nifi.yaml.j2 @@ -20,8 +20,7 @@ metadata: name: test-nifi spec: image: - productVersion: "{{ test_scenario['values']['nifi-latest'].split('-stackable')[0] }}" - stackableVersion: "{{ test_scenario['values']['nifi-latest'].split('-stackable')[1] }}" + productVersion: "{{ test_scenario['values']['nifi-latest'] }}" clusterConfig: authentication: method: diff --git a/tests/templates/kuttl/cluster_operation/40-pause-nifi.yaml.j2 b/tests/templates/kuttl/cluster_operation/40-pause-nifi.yaml.j2 index 739f5c80..6a84831e 100644 --- a/tests/templates/kuttl/cluster_operation/40-pause-nifi.yaml.j2 +++ b/tests/templates/kuttl/cluster_operation/40-pause-nifi.yaml.j2 @@ -20,8 +20,7 @@ metadata: name: test-nifi spec: image: - productVersion: "{{ test_scenario['values']['nifi-latest'].split('-stackable')[0] }}" - stackableVersion: "{{ test_scenario['values']['nifi-latest'].split('-stackable')[1] }}" + productVersion: "{{ test_scenario['values']['nifi-latest'] }}" clusterConfig: authentication: method: diff --git a/tests/templates/kuttl/cluster_operation/50-restart-nifi.yaml.j2 b/tests/templates/kuttl/cluster_operation/50-restart-nifi.yaml.j2 index 1f05f1db..55cab061 100644 --- a/tests/templates/kuttl/cluster_operation/50-restart-nifi.yaml.j2 +++ b/tests/templates/kuttl/cluster_operation/50-restart-nifi.yaml.j2 @@ -20,8 +20,7 @@ metadata: name: test-nifi spec: image: - productVersion: "{{ test_scenario['values']['nifi-latest'].split('-stackable')[0] }}" - stackableVersion: "{{ test_scenario['values']['nifi-latest'].split('-stackable')[1] }}" + productVersion: "{{ test_scenario['values']['nifi-latest'] }}" clusterConfig: authentication: method: diff --git a/tests/templates/kuttl/ldap/10-install-zk.yaml.j2 b/tests/templates/kuttl/ldap/10-install-zk.yaml.j2 index f1bb3e69..52791979 100644 --- a/tests/templates/kuttl/ldap/10-install-zk.yaml.j2 +++ b/tests/templates/kuttl/ldap/10-install-zk.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/ldap/12-install-nifi.yaml.j2 b/tests/templates/kuttl/ldap/12-install-nifi.yaml.j2 index 25a618f9..7f272bde 100644 --- a/tests/templates/kuttl/ldap/12-install-nifi.yaml.j2 +++ b/tests/templates/kuttl/ldap/12-install-nifi.yaml.j2 @@ -30,8 +30,7 @@ metadata: name: test-nifi spec: image: - productVersion: "{{ test_scenario['values']['nifi'].split('-stackable')[0] }}" - stackableVersion: "{{ test_scenario['values']['nifi'].split('-stackable')[1] }}" + productVersion: "{{ test_scenario['values']['nifi'] }}" clusterConfig: authentication: method: diff --git a/tests/templates/kuttl/logging/02-install-zookeeper.yaml.j2 b/tests/templates/kuttl/logging/02-install-zookeeper.yaml.j2 index 17ebd932..3d808a3c 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-nifi.yaml.j2 b/tests/templates/kuttl/logging/03-install-nifi.yaml.j2 index d6203c74..857646e5 100644 --- a/tests/templates/kuttl/logging/03-install-nifi.yaml.j2 +++ b/tests/templates/kuttl/logging/03-install-nifi.yaml.j2 @@ -74,8 +74,7 @@ metadata: name: test-nifi spec: image: - productVersion: "{{ test_scenario['values']['nifi'].split('-stackable')[0] }}" - stackableVersion: "{{ test_scenario['values']['nifi'].split('-stackable')[1] }}" + productVersion: "{{ test_scenario['values']['nifi'] }}" clusterConfig: authentication: method: diff --git a/tests/templates/kuttl/orphaned_resources/01-install-zk.yaml.j2 b/tests/templates/kuttl/orphaned_resources/01-install-zk.yaml.j2 index 17ebd932..3d808a3c 100644 --- a/tests/templates/kuttl/orphaned_resources/01-install-zk.yaml.j2 +++ b/tests/templates/kuttl/orphaned_resources/01-install-zk.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-nifi.yaml.j2 b/tests/templates/kuttl/orphaned_resources/02-install-nifi.yaml.j2 index 3fac5638..29ae61b1 100644 --- a/tests/templates/kuttl/orphaned_resources/02-install-nifi.yaml.j2 +++ b/tests/templates/kuttl/orphaned_resources/02-install-nifi.yaml.j2 @@ -20,8 +20,7 @@ metadata: name: test-nifi spec: image: - productVersion: "{{ test_scenario['values']['nifi'].split('-stackable')[0] }}" - stackableVersion: "{{ test_scenario['values']['nifi'].split('-stackable')[1] }}" + productVersion: "{{ test_scenario['values']['nifi'] }}" clusterConfig: authentication: method: diff --git a/tests/templates/kuttl/resources/01-install-zk.yaml.j2 b/tests/templates/kuttl/resources/01-install-zk.yaml.j2 index 17ebd932..3d808a3c 100644 --- a/tests/templates/kuttl/resources/01-install-zk.yaml.j2 +++ b/tests/templates/kuttl/resources/01-install-zk.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/resources/02-install-nifi.yaml.j2 b/tests/templates/kuttl/resources/02-install-nifi.yaml.j2 index 457ae69e..752a860d 100644 --- a/tests/templates/kuttl/resources/02-install-nifi.yaml.j2 +++ b/tests/templates/kuttl/resources/02-install-nifi.yaml.j2 @@ -20,8 +20,7 @@ metadata: name: test-nifi spec: image: - productVersion: "{{ test_scenario['values']['nifi'].split('-stackable')[0] }}" - stackableVersion: "{{ test_scenario['values']['nifi'].split('-stackable')[1] }}" + productVersion: "{{ test_scenario['values']['nifi'] }}" clusterConfig: authentication: method: diff --git a/tests/templates/kuttl/smoke/20-install-zk.yaml.j2 b/tests/templates/kuttl/smoke/20-install-zk.yaml.j2 index 9c490ec0..f1bdd4c7 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: test-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-nifi.yaml.j2 b/tests/templates/kuttl/smoke/30-install-nifi.yaml.j2 index 7e619294..caa2c1ed 100644 --- a/tests/templates/kuttl/smoke/30-install-nifi.yaml.j2 +++ b/tests/templates/kuttl/smoke/30-install-nifi.yaml.j2 @@ -20,8 +20,7 @@ metadata: name: test-nifi spec: image: - productVersion: "{{ test_scenario['values']['nifi'].split('-stackable')[0] }}" - stackableVersion: "{{ test_scenario['values']['nifi'].split('-stackable')[1] }}" + productVersion: "{{ test_scenario['values']['nifi'] }}" clusterConfig: zookeeperConfigMapName: test-nifi-znode listenerClass: {{ test_scenario['values']['listener-class'] }} diff --git a/tests/templates/kuttl/upgrade/01-install-zk.yaml.j2 b/tests/templates/kuttl/upgrade/01-install-zk.yaml.j2 index 17ebd932..3d808a3c 100644 --- a/tests/templates/kuttl/upgrade/01-install-zk.yaml.j2 +++ b/tests/templates/kuttl/upgrade/01-install-zk.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/upgrade/02-install-nifi.yaml.j2 b/tests/templates/kuttl/upgrade/02-install-nifi.yaml.j2 index f22a3332..2e5b2778 100644 --- a/tests/templates/kuttl/upgrade/02-install-nifi.yaml.j2 +++ b/tests/templates/kuttl/upgrade/02-install-nifi.yaml.j2 @@ -20,8 +20,7 @@ metadata: name: test-nifi spec: image: - productVersion: "{{ test_scenario['values']['nifi_old'].split('-stackable')[0] }}" - stackableVersion: "{{ test_scenario['values']['nifi_old'].split('-stackable')[1] }}" + productVersion: "{{ test_scenario['values']['nifi_old'] }}" clusterConfig: authentication: method: diff --git a/tests/templates/kuttl/upgrade/05-upgrade-nifi.yaml.j2 b/tests/templates/kuttl/upgrade/05-upgrade-nifi.yaml.j2 index c80b5ec8..1a306fe5 100644 --- a/tests/templates/kuttl/upgrade/05-upgrade-nifi.yaml.j2 +++ b/tests/templates/kuttl/upgrade/05-upgrade-nifi.yaml.j2 @@ -5,8 +5,7 @@ metadata: name: test-nifi spec: image: - productVersion: "{{ test_scenario['values']['nifi_new'].split('-stackable')[0] }}" - stackableVersion: "{{ test_scenario['values']['nifi_new'].split('-stackable')[1] }}" + productVersion: "{{ test_scenario['values']['nifi_new'] }}" clusterConfig: authentication: method: diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml index b990b34e..f0d3fa57 100644 --- a/tests/test-definition.yaml +++ b/tests/test-definition.yaml @@ -6,27 +6,27 @@ dimensions: - name: zookeeper values: - - 3.7.0-stackable0.0.0-dev - - 3.8.0-stackable0.0.0-dev + - 3.7.0 + - 3.8.0 - name: zookeeper-latest values: - - 3.8.0-stackable0.0.0-dev + - 3.8.0 - name: nifi values: - - 1.15.3-stackable0.0.0-dev - - 1.16.3-stackable0.0.0-dev - - 1.18.0-stackable0.0.0-dev - - 1.20.0-stackable0.0.0-dev - - 1.21.0-stackable0.0.0-dev + - 1.15.3 + - 1.16.3 + - 1.18.0 + - 1.20.0 + - 1.21.0 - name: nifi_old values: - - 1.18.0-stackable0.0.0-dev + - 1.18.0 - name: nifi_new values: - - 1.21.0-stackable0.0.0-dev + - 1.21.0 - name: nifi-latest values: - - 1.21.0-stackable0.0.0-dev + - 1.21.0 - name: ldap-use-tls values: - "false" From d587c77466bb887d8003a2ce1ce901da26086512 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 2 Aug 2023 14:15:08 +0200 Subject: [PATCH 2/6] changelog --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 26694364..2d5f01b8 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 ([#493]). + +[#493]: https://github.com/stackabletech/nifi-operator/pull/493 ## [23.7.0] - 2023-07-14 From fa2cdc3020dbd4c85afb2416e68dd906e2cde0b1 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 2 Aug 2023 14:17:29 +0200 Subject: [PATCH 3/6] fixup docs --- docs/modules/nifi/pages/usage_guide/updating.adoc | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/modules/nifi/pages/usage_guide/updating.adoc b/docs/modules/nifi/pages/usage_guide/updating.adoc index c2692f10..15fa3e03 100644 --- a/docs/modules/nifi/pages/usage_guide/updating.adoc +++ b/docs/modules/nifi/pages/usage_guide/updating.adoc @@ -32,7 +32,6 @@ spec: ---- <1> Change the NiFi version here -<2> Change the stackable image version here IMPORTANT: Due to a limitation in NiFi itself it is not possible to up- or downgrade a NiFi cluster in a rolling fashion. So any change to the NiFi version you make in this CRD will result in a full cluster restart with a short downtime. From 25f052b82cbde8b40c5a3e73a7fc06becc5e1e16 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 2 Aug 2023 14:18:10 +0200 Subject: [PATCH 4/6] charts --- deploy/helm/nifi-operator/crds/crds.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy/helm/nifi-operator/crds/crds.yaml b/deploy/helm/nifi-operator/crds/crds.yaml index 7bb40a47..7264a69d 100644 --- a/deploy/helm/nifi-operator/crds/crds.yaml +++ b/deploy/helm/nifi-operator/crds/crds.yaml @@ -1201,7 +1201,6 @@ spec: - productVersion - required: - productVersion - - stackableVersion description: The NiFi image to use properties: custom: @@ -1211,7 +1210,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 @@ -1234,7 +1233,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 nodes: From 4b9d700dc5f1e36bdb41b240a54ac5d7001c7181 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Thu, 3 Aug 2023 09:11:41 +0200 Subject: [PATCH 5/6] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d5f01b8..728da475 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ All notable changes to this project will be documented in this file. ### Added -- Default stackableVersion to operator version ([#493]). +- Default stackableVersion to operator version. It is recommended to remove `spec.image.stackableVersion` from your custom resources ([#493]). [#493]: https://github.com/stackabletech/nifi-operator/pull/493 From eb072763dfd33ddd322f52fb65b65d618a4c1b15 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Thu, 3 Aug 2023 09:37:59 +0200 Subject: [PATCH 6/6] cargo update --package serde --precise 1.0.171 --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 561e766c..84db4109 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1720,9 +1720,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.180" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea67f183f058fe88a4e3ec6e2788e003840893b91bac4559cabedd00863b3ed" +checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" dependencies = [ "serde_derive", ] @@ -1739,9 +1739,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.180" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24e744d7782b686ab3b73267ef05697159cc0e5abbed3f47f9933165e5219036" +checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" dependencies = [ "proc-macro2", "quote",