From f8f00fedfb57670670f4cedeaa9892e1b5598b87 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Wed, 19 Aug 2026 12:00:54 +0200 Subject: [PATCH 1/3] added constants and tests, use framework label functions and env-var handling --- Cargo.lock | 241 +++++++------- Cargo.nix | 297 +++++++++--------- Cargo.toml | 2 +- crate-hashes.json | 18 +- extra/crds.yaml | 6 +- rust/operator-binary/src/controller/apply.rs | 10 +- rust/operator-binary/src/controller/build.rs | 85 ++++- .../src/controller/build/properties.rs | 14 +- .../build/properties/nifi_properties.rs | 6 +- .../build/properties/state_management_xml.rs | 6 +- .../controller/build/resource/config_map.rs | 25 +- .../src/controller/build/resource/listener.rs | 35 ++- .../src/controller/build/resource/pdb.rs | 10 +- .../src/controller/build/resource/rbac.rs | 10 +- .../src/controller/build/resource/secret.rs | 6 +- .../src/controller/build/resource/service.rs | 20 +- .../controller/build/resource/statefulset.rs | 236 ++++++++++---- rust/operator-binary/src/controller/mod.rs | 117 +------ .../src/controller/update_status.rs | 4 +- .../src/controller/validate.rs | 24 +- rust/operator-binary/src/crd/mod.rs | 49 ++- rust/operator-binary/src/main.rs | 4 +- rust/operator-binary/src/nifi_controller.rs | 5 +- .../src/security/authorization.rs | 31 +- rust/operator-binary/src/security/tls.rs | 12 + tests/templates/kuttl/smoke/34-assert.yaml.j2 | 2 - 26 files changed, 709 insertions(+), 566 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 154d183d..3e2c2cb8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -163,9 +163,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.91" +version = "0.1.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae36dc4177970ef04fde5178d3e2429882def40e57a451f919c098f72baa6cec" +checksum = "82f6aeea286b8eb4dd3431a1be1b59d290ace00f5bfd8e2a159bc2a05e2c1667" dependencies = [ "proc-macro2", "quote", @@ -316,9 +316,9 @@ checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04" [[package]] name = "cc" -version = "1.4.1" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9066c49992464636f92905fa096ec58baaa4d57ec19a5c096c68d3e25ef3d136" +checksum = "509591b7bcd67f4ef775afad7662703b4935daaa6ec0e5605cfb1090b32a2b6d" dependencies = [ "find-msvc-tools", "jobserver", @@ -631,7 +631,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10d60334b3b2e7c9d91ef8150abfb6fa4c1c39ebbcf4a81c2e346aad939fee3e" dependencies = [ - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -916,9 +916,9 @@ dependencies = [ [[package]] name = "find-msvc-tools" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b73573e6edcd2af0cdf47bd6cb58f0b3839491263c314eaad1ccf24430e1de" +checksum = "d45db016d36b838f563236e9193d0ee6ce38f3f68b6c94e914b4929c96bbb890" [[package]] name = "flagset" @@ -965,9 +965,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a88cf1f829d945f548cf8fec32c61b1f202b6d93b45848602fc02af4b12ad218" +checksum = "9a31d2a3fbaaeb2af2368bbdd904aa8e812d3c04a1ee10d3171f52d556e5d0a3" dependencies = [ "futures-channel", "futures-core", @@ -980,9 +980,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "262590f4fe6afeb0bc83be1daa64e52657fe185690a958af7f3ad0e92085c5ae" +checksum = "b1f9e3d69d39e4862ffed03ed071a76f9a13ba1d9109d355b0f0aa6b15e393c4" dependencies = [ "futures-core", "futures-sink", @@ -990,15 +990,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cd50c473c80f6d7c3670a752354b8e569b1a7cbfdc0419ec88e5edad85e0dc7" +checksum = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e" [[package]] name = "futures-executor" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6754879cc9f2c66f88c6e5c35344bb0bdb0708b0352b1201815667c7eabc7458" +checksum = "031b47cf1a3c6cc8bc2fc76cd437f521619387907d469316e7c0bc278f1f5432" dependencies = [ "futures-core", "futures-task", @@ -1007,32 +1007,32 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4577ecaa3c4f96589d473f679a71b596316f6641bc350038b962a5daf0085d7a" +checksum = "53c0fa8157de1303bfffdaa1cc2a673bfffb60102f76b0ef4441659124373fed" [[package]] name = "futures-macro" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d6d3cde68c518367be28956066ddfef33813991b77a55005a69dae04bf3b10b" +checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.3", ] [[package]] name = "futures-sink" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e34418ac499d6305c2fb5ad0ed2f6ac998c5f8ca209b4510f7f94242c647e307" +checksum = "1944426bf7d03f1d14f708785e4b33efd750b36d48a157b836b3efc15ede8e1d" [[package]] name = "futures-task" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b231ed28831efb4a61a08580c4bc233ec56bc009f4cd8f52da2c3cb97df0c109" +checksum = "cd417de3d1d015fc3bfd2b1ea46dfc7bab72ef86f1cc7cc9c78e728b34a6d1fd" [[package]] name = "futures-timer" @@ -1042,9 +1042,9 @@ checksum = "af43fadb8a98512d547e37b4e92e0ced13e205c061b87b4623eff01d918d6968" [[package]] name = "futures-util" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a77a90a256fce34da66415271e30f94ee91c57b04b8a2c042d9cf3220179deaa" +checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc" dependencies = [ "futures 0.1.31", "futures-channel", @@ -1160,9 +1160,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.15" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cb093c84e8bd9b188d4c4a8cb6579fc016968d14c99882163cd3ff402a4f155" +checksum = "a9f37a958b41b3b19ee2707c06439c0e9e547e847223eb791ecb0cb821c65e27" dependencies = [ "atomic-waker", "bytes", @@ -1242,9 +1242,9 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9f41fd6a08e4d4ec69df65976da761afd5ad5e58a9d4acb46bd1c953a9e3ff2" +checksum = "23169fe34a5fbcdd3f3862e78fb9b6fccd5f02a6dc6f732547005d45631ce71c" dependencies = [ "bytes", "futures-core", @@ -1372,9 +1372,9 @@ dependencies = [ [[package]] name = "icu_collections" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c" +checksum = "fa68d21081c4a05d5a901a1c62add574c77048b6a1c67be3b50ce0b60d4ca513" dependencies = [ "displaydoc", "potential_utf", @@ -1386,9 +1386,9 @@ dependencies = [ [[package]] name = "icu_locale_core" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29" +checksum = "d56e28588da92eee5c3201a6eff33fabdd49b62269c8938d4ff050ce4d900deb" dependencies = [ "displaydoc", "litemap", @@ -1399,9 +1399,9 @@ dependencies = [ [[package]] name = "icu_normalizer" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4" +checksum = "12f9cf5f235641ed274641dd81c3f28d870e276763d0797aeeab72317b1c646f" dependencies = [ "icu_collections", "icu_normalizer_data", @@ -1413,16 +1413,17 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38" +checksum = "1563da1ed3e0b3bf3d74c9b85917ac9c56464d2f57242270c09c9e752f8021a0" [[package]] name = "icu_properties" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de" +checksum = "7e7ca276ad3145661a65914e6daf131ca5120cd3dcee8f8f3214b8875184a148" dependencies = [ + "displaydoc", "icu_collections", "icu_locale_core", "icu_properties_data", @@ -1433,15 +1434,15 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14" +checksum = "e590f038c1464a96894fd6d10127e90a8be4509f56ff7ecef851b15cee0b7caa" [[package]] name = "icu_provider" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421" +checksum = "92a7ed671a6aad807a8651a2e1782a6598fda9ce5185dd8158549e95a91c6428" dependencies = [ "displaydoc", "icu_locale_core", @@ -1610,7 +1611,7 @@ dependencies = [ "jni-sys", "log", "simd_cesu8", - "thiserror 2.0.19", + "thiserror 2.0.20", "walkdir", "windows-link", ] @@ -1659,9 +1660,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.103" +version = "0.3.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b44bfcdb3f8d5837a46dae1ca9660a837176eee74a28b229bc626816589102" +checksum = "0e0c1080212aad755ea003d18543e8768dd432c48819efd73a7bf1e39b7a5a3a" dependencies = [ "cfg-if", "futures-util", @@ -1678,7 +1679,7 @@ dependencies = [ "schemars", "serde", "serde_json", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -1691,7 +1692,7 @@ dependencies = [ "pest_derive", "regex", "serde_json", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -1720,7 +1721,7 @@ dependencies = [ [[package]] name = "k8s-version" version = "0.1.3" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#fb2d86579f4e3df008f78f0e527a012243483a2d" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.116.0#7b9f9ac9a76fa425ab27f2821377ef86571ca121" dependencies = [ "darling 0.24.0", "regex", @@ -1764,7 +1765,7 @@ dependencies = [ "base64 0.22.1", "bytes", "either", - "futures 0.3.33", + "futures 0.3.34", "http", "http-body", "http-body-util", @@ -1783,7 +1784,7 @@ dependencies = [ "serde", "serde-saphyr", "serde_json", - "thiserror 2.0.19", + "thiserror 2.0.20", "tokio", "tokio-util", "tower", @@ -1807,7 +1808,7 @@ dependencies = [ "serde", "serde-value", "serde_json", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -1835,7 +1836,7 @@ dependencies = [ "async-stream", "backon", "educe 0.6.0", - "futures 0.3.33", + "futures 0.3.34", "hashbrown 0.16.1", "hostname", "json-patch", @@ -1845,7 +1846,7 @@ dependencies = [ "pin-project", "serde", "serde_json", - "thiserror 2.0.19", + "thiserror 2.0.20", "tokio", "tokio-util", "tracing", @@ -1898,9 +1899,9 @@ dependencies = [ [[package]] name = "litemap" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0" +checksum = "47d9d19d1d6efa0109d2f65ff4c85cddd50bd572e5a00127ab10987290bcefae" [[package]] name = "lock_api" @@ -2004,9 +2005,9 @@ checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441" [[package]] name = "num-integer" -version = "0.1.46" +version = "0.1.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +checksum = "7ce2d95d4b3734dc35aa2f45e1aa22cd416814592a4f9d9205e11affd5b8e10b" dependencies = [ "num-traits", ] @@ -2059,7 +2060,7 @@ dependencies = [ "futures-sink", "js-sys", "pin-project-lite", - "thiserror 2.0.19", + "thiserror 2.0.20", "tracing", ] @@ -2101,7 +2102,7 @@ dependencies = [ "opentelemetry_sdk", "prost", "reqwest", - "thiserror 2.0.19", + "thiserror 2.0.20", "tokio", "tonic", "tonic-types", @@ -2139,7 +2140,7 @@ dependencies = [ "percent-encoding", "portable-atomic", "rand 0.9.5", - "thiserror 2.0.19", + "thiserror 2.0.20", "tokio", "tokio-stream", ] @@ -2221,9 +2222,9 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "pest" -version = "2.8.8" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7df728be843c7070fab6ab7c328c4e9e9d78e23bf749c0669c86ee7ebfa050a2" +checksum = "5a07a60cc7a4d00c91f95c685609d1d2f79050e6804b70ebedd7650f0b839bcf" dependencies = [ "memchr", "ucd-trie", @@ -2231,9 +2232,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.8.8" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e2dd6fc3b26b3462ee188aac870f5a41d398f1cd5e2408d16531bd71c9591fd" +checksum = "b3a83744a5c8455b8b3e0dc5031362780a347c878bdd11584d1a8984228cc88d" dependencies = [ "pest", "pest_generator", @@ -2241,9 +2242,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.8.8" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a7a9205cfb6f596a9e8b689c0a15f9ceb7a1aafae7aaf788150ac65b29975b6" +checksum = "e0cd3451aa3de60d4b9a1e736885e4dea6b31617598026f12256ad566d63304a" dependencies = [ "pest", "pest_meta", @@ -2254,9 +2255,9 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.8.8" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85abd351c0de1e8384fc791a0737111a350394937e92b956b743dac12429f57c" +checksum = "e04d3a0849e241d7dfce834c83b1c5edc8622009e8dd51a12ba1927c32f05496" dependencies = [ "pest", ] @@ -2310,15 +2311,15 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" +checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548" [[package]] name = "portable-atomic" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d20d5497ef88037a52ff98267d066e7f11fcc5e99bbfbd58a42336193aacec3" +checksum = "05c8b63e8d9609db387f0324918f81d68fe27748f084ef092fb35954d0539a85" [[package]] name = "portable-atomic-util" @@ -2331,9 +2332,9 @@ dependencies = [ [[package]] name = "potential_utf" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564" +checksum = "d83eb9bc6d8e5cf568e7a1101d60ee05e81ed50ea106026f3d18deeb046d7661" dependencies = [ "zerovec", ] @@ -2761,9 +2762,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" [[package]] name = "rustls-webpki" -version = "0.103.13" +version = "0.103.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e" +checksum = "0527518605e68109d875e248ea259b6758801cf165e4b2c2733ae3b51f12535a" dependencies = [ "ring", "rustls-pki-types", @@ -3171,7 +3172,7 @@ checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "stackable-certs" version = "0.4.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#fb2d86579f4e3df008f78f0e527a012243483a2d" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.116.0#7b9f9ac9a76fa425ab27f2821377ef86571ca121" dependencies = [ "const-oid", "ecdsa", @@ -3201,7 +3202,7 @@ dependencies = [ "clap", "const_format", "fnv", - "futures 0.3.33", + "futures 0.3.34", "indoc", "pin-project", "pretty_assertions", @@ -3221,8 +3222,8 @@ dependencies = [ [[package]] name = "stackable-operator" -version = "0.115.0" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#fb2d86579f4e3df008f78f0e527a012243483a2d" +version = "0.116.0" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.116.0#7b9f9ac9a76fa425ab27f2821377ef86571ca121" dependencies = [ "base64 0.23.1", "clap", @@ -3231,7 +3232,7 @@ dependencies = [ "dockerfile-parser", "educe 0.7.6", "either", - "futures 0.3.33", + "futures 0.3.34", "http", "indexmap", "java-properties", @@ -3266,7 +3267,7 @@ dependencies = [ [[package]] name = "stackable-operator-derive" version = "0.3.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#fb2d86579f4e3df008f78f0e527a012243483a2d" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.116.0#7b9f9ac9a76fa425ab27f2821377ef86571ca121" dependencies = [ "darling 0.24.0", "proc-macro2", @@ -3277,7 +3278,7 @@ dependencies = [ [[package]] name = "stackable-shared" version = "0.1.2" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#fb2d86579f4e3df008f78f0e527a012243483a2d" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.116.0#7b9f9ac9a76fa425ab27f2821377ef86571ca121" dependencies = [ "jiff", "k8s-openapi", @@ -3294,7 +3295,7 @@ dependencies = [ [[package]] name = "stackable-telemetry" version = "0.6.5" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#fb2d86579f4e3df008f78f0e527a012243483a2d" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.116.0#7b9f9ac9a76fa425ab27f2821377ef86571ca121" dependencies = [ "axum", "clap", @@ -3318,7 +3319,7 @@ dependencies = [ [[package]] name = "stackable-versioned" version = "0.11.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#fb2d86579f4e3df008f78f0e527a012243483a2d" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.116.0#7b9f9ac9a76fa425ab27f2821377ef86571ca121" dependencies = [ "kube", "schemars", @@ -3332,7 +3333,7 @@ dependencies = [ [[package]] name = "stackable-versioned-macros" version = "0.11.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#fb2d86579f4e3df008f78f0e527a012243483a2d" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.116.0#7b9f9ac9a76fa425ab27f2821377ef86571ca121" dependencies = [ "convert_case", "convert_case_extras", @@ -3350,7 +3351,7 @@ dependencies = [ [[package]] name = "stackable-webhook" version = "0.9.2" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#fb2d86579f4e3df008f78f0e527a012243483a2d" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.116.0#7b9f9ac9a76fa425ab27f2821377ef86571ca121" dependencies = [ "arc-swap", "async-trait", @@ -3482,11 +3483,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.19" +version = "2.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a43598840e33d5b0331f38c5e30d13bb11c11210a4b58f0d9b18a5a5eefcd9" +checksum = "ec86235f5fcc2a73650310756d2ac5b138a5780bbbdfae3eeccec992c435ba4f" dependencies = [ - "thiserror-impl 2.0.19", + "thiserror-impl 2.0.20", ] [[package]] @@ -3502,9 +3503,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.19" +version = "2.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43cbfe0cf76104d42a574802844187e84a305e531ed54455f11fbde0f10541cd" +checksum = "bc04cd3e1236dd4a98afca4569f2deb3f120e5422a4023be2cb683f8486292af" dependencies = [ "proc-macro2", "quote", @@ -3552,9 +3553,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d" +checksum = "b1e27c91459209c2986af3dcf603a5a74a4368754ce37414f59acc971167f643" dependencies = [ "displaydoc", "zerovec", @@ -3813,7 +3814,7 @@ checksum = "050686193eb999b4bb3bc2acfa891a13da00f79734704c4b8b4ef1a10b368a3c" dependencies = [ "crossbeam-channel", "symlink", - "thiserror 2.0.19", + "thiserror 2.0.20", "time", "tracing-subscriber", ] @@ -3978,9 +3979,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.24.0" +version = "1.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf3923a6f5c4c6382e0b653c4117f48d631ea17f38ed86e2a828e6f7412f5239" +checksum = "2cefc03fd367c0c6d4305de1b312cf00248c4114f4a0418ce6a6af769e3b0bd9" dependencies = [ "js-sys", "wasm-bindgen", @@ -4040,9 +4041,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.126" +version = "0.2.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b067c0c11094aef6b7a801c1e34a26affafdf3d051dba08456b868789aaf9a4" +checksum = "1b70935747edd64d89de3efa29d73789b806c15798f8e7dca4d8ac356b50ce70" dependencies = [ "cfg-if", "once_cell", @@ -4053,9 +4054,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.76" +version = "0.4.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62df1340f32221cb9c54d6a27b030e3dba64361d4a95bed55f9aacb44da291d" +checksum = "6b7777d5cc23d0e91404e53ce2d5e8ec7acae3026b16233dba62cd3246457950" dependencies = [ "js-sys", "wasm-bindgen", @@ -4063,9 +4064,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.126" +version = "0.2.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167ce5e579f6bcf889c4f7175a8a5a585de84e8ff93976ce393efa5f2837aab1" +checksum = "77775f8f3f7217702089053b94958f8f54061a3f663417df76e19cbdcca29bc1" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4073,9 +4074,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.126" +version = "0.2.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3997c7839262f4ef12cf90b818d6340c18e80f263f1a94bf157d0ec4420380e" +checksum = "e11d33f857dc2fb11b8bc75aee111aa9cbeb12cd9f25efd3d4c2a3dd4e235284" dependencies = [ "bumpalo", "proc-macro2", @@ -4086,18 +4087,18 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.126" +version = "0.2.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc1b4cb0cc549fcf58d7dfc081778139b3d283a081644e833e84682ad71cea24" +checksum = "7ef64dbcc55df09c7e5a46182d181c2cfa3e925f3da937ea764728b4bbb9dcbf" dependencies = [ "unicode-ident", ] [[package]] name = "web-sys" -version = "0.3.103" +version = "0.3.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8622dcb61c0bcc9fffa6938bed81210af2da9a7e4a1a834b2e37a59b6dfb6141" +checksum = "c435338968042f4f59a557f690a253676d47ce13ceb55d70100e7facf6620a30" dependencies = [ "js-sys", "wasm-bindgen", @@ -4289,9 +4290,9 @@ checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" [[package]] name = "writeable" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4" +checksum = "3ad82d2a33cdc9674dc7465672f271e096168fcdbe0f799d9e6db8c5892679dc" [[package]] name = "x509-cert" @@ -4405,9 +4406,9 @@ dependencies = [ [[package]] name = "zerotrie" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf" +checksum = "4ea269c3bd32f0a32c321907a2ae912ba6f4649bb0fc764a15627e99a7095a3f" dependencies = [ "displaydoc", "yoke", @@ -4416,9 +4417,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.11.6" +version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239" +checksum = "94b5c6b5976d66c1d703c4fd17d3f5e43c8cedaacf604961b171adc7130896d8" dependencies = [ "yoke", "zerofrom", @@ -4427,13 +4428,13 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555" +checksum = "9f212a141d820099d57ffafb9569be9617a6f27d3dc881fbee8fb56642f917a9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.3", ] [[package]] diff --git a/Cargo.nix b/Cargo.nix index 75d7c7f8..dd1cb000 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -489,9 +489,9 @@ rec { }; "async-trait" = rec { crateName = "async-trait"; - version = "0.1.91"; + version = "0.1.92"; edition = "2021"; - sha256 = "1v3cm8mzg66037wm392p1vsdx0lq8bid6y2ivr7z03lpfx0xqdmf"; + sha256 = "0rqn5iga1hlv2lm8xzav1zhar46jb4dvx89i6kfv93kb53maxxl2"; procMacro = true; libName = "async_trait"; authors = [ @@ -989,9 +989,9 @@ rec { }; "cc" = rec { crateName = "cc"; - version = "1.4.1"; + version = "1.4.3"; edition = "2021"; - sha256 = "0dniydgf5lv8dh4mr6n1gvas9albqmp0kyh557wkcij6jacw8rlh"; + sha256 = "0v9b5arr047vbihfbh3fmbd3aj9vf1i7dbdgfpvlwzynpjvr35ah"; dependencies = [ { name = "find-msvc-tools"; @@ -1903,7 +1903,7 @@ rec { dependencies = [ { name = "thiserror"; - packageId = "thiserror 2.0.19"; + packageId = "thiserror 2.0.20"; } ]; features = { @@ -2804,9 +2804,9 @@ rec { }; "find-msvc-tools" = rec { crateName = "find-msvc-tools"; - version = "0.1.10"; + version = "0.1.11"; edition = "2021"; - sha256 = "1pp1612g5k6im9732g16j6a87czhb35xcyzlrpq2mkgdwrrkbdr6"; + sha256 = "145qpfb9r4ml2klr8v4byvrkikp61qyiks9n69b8z0vbscbb0pfl"; libName = "find_msvc_tools"; }; @@ -2933,11 +2933,11 @@ rec { }; resolvedDefaultFeatures = [ "default" "use_std" "with-deprecated" ]; }; - "futures 0.3.33" = rec { + "futures 0.3.34" = rec { crateName = "futures"; - version = "0.3.33"; + version = "0.3.34"; edition = "2018"; - sha256 = "066j5aqz8an05xh4hn5ljdnjn80z3g335v4grx4gaifr57wg3358"; + sha256 = "18yhwmbdalhz2z9i1vm10hy2v0cfm82dkgcb6vr2msxazfix4ccs"; dependencies = [ { name = "futures-channel"; @@ -2997,9 +2997,9 @@ rec { }; "futures-channel" = rec { crateName = "futures-channel"; - version = "0.3.33"; + version = "0.3.34"; edition = "2018"; - sha256 = "1bn5hlhfkl1sgypmiachaqcgwmr6wmjal7dyhfyb1zkazvs90996"; + sha256 = "1i4kwcanpaphn1ax62ci3nx176kglxqx0gnhzqpqdr1rkpbf7ydi"; libName = "futures_channel"; dependencies = [ { @@ -3025,9 +3025,9 @@ rec { }; "futures-core" = rec { crateName = "futures-core"; - version = "0.3.33"; + version = "0.3.34"; edition = "2018"; - sha256 = "1iqdbvcdlplfr2g43h7xrfkv2sg5p1a26x8acz1xgxl07i3hrm9c"; + sha256 = "0pjgv4fx0np6hrs5sz5a2phabwv0z70yr51v03injbi44bjrkmlj"; libName = "futures_core"; features = { "default" = [ "std" ]; @@ -3038,9 +3038,9 @@ rec { }; "futures-executor" = rec { crateName = "futures-executor"; - version = "0.3.33"; + version = "0.3.34"; edition = "2018"; - sha256 = "0n3lpkmcfrsnh40i4armn040gnqbpd257hz5qs46zipjr6f8fm37"; + sha256 = "0cjl3y7jgg60wwb96ikxj23r6q91ylvx8v675yychv1w3b7lf6q3"; libName = "futures_executor"; dependencies = [ { @@ -3068,9 +3068,9 @@ rec { }; "futures-io" = rec { crateName = "futures-io"; - version = "0.3.33"; + version = "0.3.34"; edition = "2018"; - sha256 = "0yjx13qdm9b2p4w00ddw85k6yccnnmqrlrrz8yfmi5jg7jmfqxs5"; + sha256 = "1v9z6wj92ra18kpv0xig21hgpzrvcwmcr8fszyzh64yyay0zmh2k"; libName = "futures_io"; features = { "default" = [ "std" ]; @@ -3079,9 +3079,9 @@ rec { }; "futures-macro" = rec { crateName = "futures-macro"; - version = "0.3.33"; + version = "0.3.34"; edition = "2018"; - sha256 = "02xiyd5y1nk9b805aympj4wq2czgvxnhcml9w9xkc665d3g3qv9d"; + sha256 = "0i0czvcvsqq4hrccibq2f23004si5z34zjwdxfmqhlrmm15nbfcz"; procMacro = true; libName = "futures_macro"; dependencies = [ @@ -3095,7 +3095,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.119"; + packageId = "syn 3.0.3"; features = [ "full" ]; } ]; @@ -3103,9 +3103,9 @@ rec { }; "futures-sink" = rec { crateName = "futures-sink"; - version = "0.3.33"; + version = "0.3.34"; edition = "2018"; - sha256 = "01z38z344hpryw84b6r0rbwcb669d8pyvl2szg10aqwx96n1hi73"; + sha256 = "07cfvrgc3vxk6sw5g8a8dnrm1mzg6d5mwy08ywa1sgyhyxml4i0r"; libName = "futures_sink"; features = { "default" = [ "std" ]; @@ -3115,9 +3115,9 @@ rec { }; "futures-task" = rec { crateName = "futures-task"; - version = "0.3.33"; + version = "0.3.34"; edition = "2018"; - sha256 = "02f1y1yvjg1cv998zkgl1706pi9y4fyc9045l1hlmyqyhclfscdj"; + sha256 = "1zfilqs8nwlfqz4prk7ihvpp5avvzins87ibzlxzq5fhs7ipshfd"; libName = "futures_task"; features = { "default" = [ "std" ]; @@ -3142,9 +3142,9 @@ rec { }; "futures-util" = rec { crateName = "futures-util"; - version = "0.3.33"; + version = "0.3.34"; edition = "2018"; - sha256 = "1anyg40j5www5l22r2jbn1birsafz4q1w9qmcjk4vqzwasi90ym7"; + sha256 = "1g3r9ghzq7c2fh34lis43i72xavk9p84npgfwgb5vfpqcwjajl0d"; libName = "futures_util"; dependencies = [ { @@ -3631,9 +3631,9 @@ rec { }; "h2" = rec { crateName = "h2"; - version = "0.4.15"; + version = "0.4.16"; edition = "2021"; - sha256 = "0mgilh1g8gydcchqi6acs5l6j0gwg5jwpa64sj4b3ncb9v497c3c"; + sha256 = "09syqqhvh36b3rwyn8vjhiz597hfki1hcz3hwagb3cs1ifapmwx9"; authors = [ "Carl Lerche " "Sean McArthur " @@ -3871,9 +3871,9 @@ rec { }; "http-body-util" = rec { crateName = "http-body-util"; - version = "0.1.4"; + version = "0.1.5"; edition = "2018"; - sha256 = "1wizkqx9a75x8v5lm7cawpammz8sfvd7cngnkp34wkcfl3b1zx79"; + sha256 = "07773iilap808wjp6vywlq15zkgwnswqzrv270zxvg2z9biry5i3"; libName = "http_body_util"; authors = [ "Carl Lerche " @@ -4381,9 +4381,9 @@ rec { }; "icu_collections" = rec { crateName = "icu_collections"; - version = "2.2.0"; - edition = "2021"; - sha256 = "070r7xd0pynm0hnc1v2jzlbxka6wf50f81wybf9xg0y82v6x3119"; + version = "2.3.0"; + edition = "2024"; + sha256 = "04x59h6vdq0cnpippim1nr471ivlsnnn470sj1d5v864h48d4s7s"; authors = [ "The ICU4X Project Developers" ]; @@ -4431,9 +4431,9 @@ rec { }; "icu_locale_core" = rec { crateName = "icu_locale_core"; - version = "2.2.0"; - edition = "2021"; - sha256 = "0a9cmin5w1x3bg941dlmgszn33qgq428k7qiqn5did72ndi9n8cj"; + version = "2.3.0"; + edition = "2024"; + sha256 = "1sqdj16wwl7h9y6r7j394av4kpdb7zryz9h169ffwbm9imc2hvnm"; authors = [ "The ICU4X Project Developers" ]; @@ -4483,9 +4483,9 @@ rec { }; "icu_normalizer" = rec { crateName = "icu_normalizer"; - version = "2.2.0"; - edition = "2021"; - sha256 = "1d7krxr0xpc4x9635k1100a24nh0nrc59n65j6yk6gbfkplmwvn5"; + version = "2.3.0"; + edition = "2024"; + sha256 = "0vv43ixk2wmbxrx7kl33cwkhx1wdyb1q3pa18qkyshan4dgwzy8j"; authors = [ "The ICU4X Project Developers" ]; @@ -4537,9 +4537,9 @@ rec { }; "icu_normalizer_data" = rec { crateName = "icu_normalizer_data"; - version = "2.2.0"; - edition = "2021"; - sha256 = "0f5d5d5fhhr9937m2z6z38fzh6agf14z24kwlr6lyczafypf0fys"; + version = "2.3.0"; + edition = "2024"; + sha256 = "1811h0ppb7lwq1q2492p5x6lcmlwmhbmkf69fhyvzcz0scgdlqqm"; authors = [ "The ICU4X Project Developers" ]; @@ -4547,13 +4547,18 @@ rec { }; "icu_properties" = rec { crateName = "icu_properties"; - version = "2.2.0"; - edition = "2021"; - sha256 = "1pkh3s837808cbwxvfagwc28cvwrz2d9h5rl02jwrhm51ryvdqxy"; + version = "2.3.0"; + edition = "2024"; + sha256 = "0j51hi8qgf0l6a7qzvnwsc61598w2fpnsklicld6ci9immva4z3y"; authors = [ "The ICU4X Project Developers" ]; dependencies = [ + { + name = "displaydoc"; + packageId = "displaydoc"; + usesDefaultFeatures = false; + } { name = "icu_collections"; packageId = "icu_collections"; @@ -4595,6 +4600,7 @@ rec { "datagen" = [ "serde" "dep:databake" "zerovec/databake" "icu_collections/databake" "icu_locale_core/databake" "zerotrie/databake" "icu_provider/export" ]; "default" = [ "compiled_data" ]; "harfbuzz_traits" = [ "dep:harfbuzz-traits" ]; + "log" = [ "dep:log" ]; "serde" = [ "dep:serde" "icu_locale_core/serde" "zerovec/serde" "icu_collections/serde" "icu_provider/serde" "zerotrie/serde" ]; "unicode_bidi" = [ "dep:unicode-bidi" ]; }; @@ -4602,9 +4608,9 @@ rec { }; "icu_properties_data" = rec { crateName = "icu_properties_data"; - version = "2.2.0"; - edition = "2021"; - sha256 = "052awny0qwkbcbpd5jg2cd7vl5ry26pq4hz1nfsgf10c3qhbnawf"; + version = "2.3.0"; + edition = "2024"; + sha256 = "1akw1gp5rcaiz377xzsnkx8f92qax4kh3lfn9y4rcjj6q4wg1475"; authors = [ "The ICU4X Project Developers" ]; @@ -4612,9 +4618,9 @@ rec { }; "icu_provider" = rec { crateName = "icu_provider"; - version = "2.2.0"; - edition = "2021"; - sha256 = "08dl8pxbwr8zsz4c5vphqb7xw0hykkznwi4rw7bk6pwb3krlr70k"; + version = "2.3.0"; + edition = "2024"; + sha256 = "0a343jlrb7jlb20xv1airslzv63559wf38jihrx81bba39kyv9wj"; authors = [ "The ICU4X Project Developers" ]; @@ -5113,7 +5119,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 2.0.19"; + packageId = "thiserror 2.0.20"; } { name = "windows-link"; @@ -5231,9 +5237,9 @@ rec { }; "js-sys" = rec { crateName = "js-sys"; - version = "0.3.103"; + version = "0.3.104"; edition = "2021"; - sha256 = "00lib0b6hqmw56r2hjp7xrv730qacslirbkdlhvmi39zvgy4pd2k"; + sha256 = "0fjsgady7wbv7bbyy6c8qhrd93bnx11qbl83l1g7bb9a4601030f"; libName = "js_sys"; authors = [ "The wasm-bindgen Developers" @@ -5293,7 +5299,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 2.0.19"; + packageId = "thiserror 2.0.20"; } ]; devDependencies = [ @@ -5342,7 +5348,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 2.0.19"; + packageId = "thiserror 2.0.20"; } ]; @@ -5440,8 +5446,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "fb2d86579f4e3df008f78f0e527a012243483a2d"; - sha256 = "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb"; + rev = "7b9f9ac9a76fa425ab27f2821377ef86571ca121"; + sha256 = "1p3744fxgvs12sqwvi8hhainwrgvhdfwmbyqf0sp0aq3awq3q1v9"; }; libName = "k8s_version"; authors = [ @@ -5619,7 +5625,7 @@ rec { } { name = "futures"; - packageId = "futures 0.3.33"; + packageId = "futures 0.3.34"; optional = true; usesDefaultFeatures = false; features = [ "std" ]; @@ -5719,7 +5725,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 2.0.19"; + packageId = "thiserror 2.0.20"; } { name = "tokio"; @@ -5755,7 +5761,7 @@ rec { devDependencies = [ { name = "futures"; - packageId = "futures 0.3.33"; + packageId = "futures 0.3.34"; usesDefaultFeatures = false; features = [ "async-await" ]; } @@ -5885,7 +5891,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 2.0.19"; + packageId = "thiserror 2.0.20"; } ]; devDependencies = [ @@ -5992,7 +5998,7 @@ rec { } { name = "futures"; - packageId = "futures 0.3.33"; + packageId = "futures 0.3.34"; usesDefaultFeatures = false; features = [ "async-await" ]; } @@ -6037,7 +6043,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 2.0.19"; + packageId = "thiserror 2.0.20"; } { name = "tokio"; @@ -6216,9 +6222,9 @@ rec { }; "litemap" = rec { crateName = "litemap"; - version = "0.8.2"; + version = "0.8.3"; edition = "2021"; - sha256 = "1w7628bc7wwcxc4n4s5kw0610xk06710nh2hn5kwwk2wa91z9nlj"; + sha256 = "1bpgpj87560hmckh3875fbahpmfxbk4g8pzns84h3ykf3nfx3na7"; authors = [ "The ICU4X Project Developers" ]; @@ -6536,9 +6542,9 @@ rec { }; "num-integer" = rec { crateName = "num-integer"; - version = "0.1.46"; + version = "0.1.47"; edition = "2018"; - sha256 = "13w5g54a9184cqlbsq80rnxw4jj4s0d8wv75jsq5r2lms8gncsbr"; + sha256 = "02z1p3azy6p10n99skrab4a6hhfd4amf2i9gm8sxqd1p9dfxkqkw"; libName = "num_integer"; authors = [ "The Rust Project Developers" @@ -6680,7 +6686,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 2.0.19"; + packageId = "thiserror 2.0.20"; optional = true; usesDefaultFeatures = false; } @@ -6850,7 +6856,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 2.0.19"; + packageId = "thiserror 2.0.20"; usesDefaultFeatures = false; } { @@ -7057,7 +7063,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 2.0.19"; + packageId = "thiserror 2.0.20"; usesDefaultFeatures = false; } { @@ -7358,9 +7364,9 @@ rec { }; "pest" = rec { crateName = "pest"; - version = "2.8.8"; + version = "2.9.0"; edition = "2021"; - sha256 = "18jhl2zpxvl6kikc0jgp7gi7i7cy9s634z5bnvx70w1whjz2ixvx"; + sha256 = "1kwvhc5hyrfpxpmp0jw0wr891xyjs44mcs2wz68hrl54qw6ac1ss"; authors = [ "Dragoș Tiselice " ]; @@ -7387,9 +7393,9 @@ rec { }; "pest_derive" = rec { crateName = "pest_derive"; - version = "2.8.8"; + version = "2.9.0"; edition = "2021"; - sha256 = "1zcijlfdf6sk2s6l1qnm3j7kj7d4ymqcial8w4p4dcr67gydcbcy"; + sha256 = "13f8ihi8928s9mc13pcbhxy382kqc89h7i8d7s5mnif8lm23ga5k"; procMacro = true; authors = [ "Dragoș Tiselice " @@ -7415,9 +7421,9 @@ rec { }; "pest_generator" = rec { crateName = "pest_generator"; - version = "2.8.8"; + version = "2.9.0"; edition = "2021"; - sha256 = "1dkmk6r6bb2hh5wayymfmwd7mswwbyhw12dnx2lrdxdnrw2r4yka"; + sha256 = "0jihcdnmdban4bqjd02r2wbb79nywj2nhwqyk95hvrixm98k9kg0"; authors = [ "Dragoș Tiselice " ]; @@ -7453,9 +7459,9 @@ rec { }; "pest_meta" = rec { crateName = "pest_meta"; - version = "2.8.8"; + version = "2.9.0"; edition = "2021"; - sha256 = "0z7m54jc3nj3nxbbk4kyjfa06d8s24vhf6krzj2867nyq18x7aw5"; + sha256 = "15jly0r7r4m15fhm3pg814h65j7dqnqq6k43rvgxfhg29443lkg0"; authors = [ "Dragoș Tiselice " ]; @@ -7586,9 +7592,9 @@ rec { }; "pkg-config" = rec { crateName = "pkg-config"; - version = "0.3.33"; - edition = "2018"; - sha256 = "17jnqmcbxsnwhg9gjf0nh6dj5k0x3hgwi3mb9krjnmfa9v435w8r"; + version = "0.3.34"; + edition = "2021"; + sha256 = "0j05h08nzg0q8rf6lzw7nry0b7kn7x97vc9n4hwrl52fqzxn9d7n"; libName = "pkg_config"; authors = [ "Alex Crichton " @@ -7597,9 +7603,9 @@ rec { }; "portable-atomic" = rec { crateName = "portable-atomic"; - version = "1.14.0"; + version = "1.15.0"; edition = "2018"; - sha256 = "1hyfma9n2cs2ibazpfwrbv61zwg7cv86g0pr5yjkg07qgr4xa81x"; + sha256 = "11csag858ndk5w4yz17h91vy53ynh67r2903gwwdn2cnilzbdj05"; libName = "portable_atomic"; features = { "critical-section" = [ "dep:critical-section" ]; @@ -7630,9 +7636,9 @@ rec { }; "potential_utf" = rec { crateName = "potential_utf"; - version = "0.1.5"; + version = "0.1.6"; edition = "2021"; - sha256 = "0r0518fr32xbkgzqap509s3r60cr0iancsg9j1jgf37cyz7b20q1"; + sha256 = "0qbndl2fpphq7mph41m11vaixs05xrh1s451wxlgap4fdnybjgnq"; authors = [ "The ICU4X Project Developers" ]; @@ -9125,9 +9131,9 @@ rec { }; "rustls-webpki" = rec { crateName = "rustls-webpki"; - version = "0.103.13"; + version = "0.103.14"; edition = "2021"; - sha256 = "0vkm7z9pnxz5qz66p2kmyy2pwx0g4jnsbqk5xzfhs4czcjl2ki31"; + sha256 = "0njk28gvbqrsfg1b5r35y4f80n37kcjylj72fpc0k0g60n3529q5"; libName = "webpki"; dependencies = [ { @@ -9151,7 +9157,7 @@ rec { "alloc" = [ "ring?/alloc" "pki-types/alloc" ]; "aws-lc-rs" = [ "dep:aws-lc-rs" "aws-lc-rs/aws-lc-sys" "aws-lc-rs/prebuilt-nasm" ]; "aws-lc-rs-fips" = [ "dep:aws-lc-rs" "aws-lc-rs/fips" ]; - "aws-lc-rs-unstable" = [ "aws-lc-rs" "aws-lc-rs/unstable" ]; + "aws-lc-rs-unstable" = [ "aws-lc-rs" ]; "default" = [ "std" ]; "ring" = [ "dep:ring" ]; "std" = [ "alloc" "pki-types/std" ]; @@ -10363,8 +10369,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "fb2d86579f4e3df008f78f0e527a012243483a2d"; - sha256 = "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb"; + rev = "7b9f9ac9a76fa425ab27f2821377ef86571ca121"; + sha256 = "1p3744fxgvs12sqwvi8hhainwrgvhdfwmbyqf0sp0aq3awq3q1v9"; }; libName = "stackable_certs"; authors = [ @@ -10493,7 +10499,7 @@ rec { } { name = "futures"; - packageId = "futures 0.3.33"; + packageId = "futures 0.3.34"; features = [ "compat" ]; } { @@ -10574,13 +10580,13 @@ rec { }; "stackable-operator" = rec { crateName = "stackable-operator"; - version = "0.115.0"; + version = "0.116.0"; edition = "2024"; workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "fb2d86579f4e3df008f78f0e527a012243483a2d"; - sha256 = "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb"; + rev = "7b9f9ac9a76fa425ab27f2821377ef86571ca121"; + sha256 = "1p3744fxgvs12sqwvi8hhainwrgvhdfwmbyqf0sp0aq3awq3q1v9"; }; libName = "stackable_operator"; authors = [ @@ -10620,7 +10626,7 @@ rec { } { name = "futures"; - packageId = "futures 0.3.33"; + packageId = "futures 0.3.34"; } { name = "http"; @@ -10760,7 +10766,8 @@ rec { "client-feature-gates" = [ "dep:winnow" ]; "crds" = [ "dep:stackable-versioned" ]; "default" = [ "crds" ]; - "full" = [ "client-feature-gates" "crds" "certs" "test-support" "time" "webhook" "kube-ws" ]; + "full" = [ "client-feature-gates" "crds" "certs" "test-support" "time" "webhook" "kube-ws" "kube-cel" ]; + "kube-cel" = [ "kube/cel" ]; "kube-ws" = [ "kube/ws" ]; "time" = [ "stackable-shared/time" ]; "webhook" = [ "dep:stackable-webhook" ]; @@ -10774,8 +10781,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "fb2d86579f4e3df008f78f0e527a012243483a2d"; - sha256 = "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb"; + rev = "7b9f9ac9a76fa425ab27f2821377ef86571ca121"; + sha256 = "1p3744fxgvs12sqwvi8hhainwrgvhdfwmbyqf0sp0aq3awq3q1v9"; }; procMacro = true; libName = "stackable_operator_derive"; @@ -10809,8 +10816,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "fb2d86579f4e3df008f78f0e527a012243483a2d"; - sha256 = "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb"; + rev = "7b9f9ac9a76fa425ab27f2821377ef86571ca121"; + sha256 = "1p3744fxgvs12sqwvi8hhainwrgvhdfwmbyqf0sp0aq3awq3q1v9"; }; libName = "stackable_shared"; authors = [ @@ -10890,8 +10897,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "fb2d86579f4e3df008f78f0e527a012243483a2d"; - sha256 = "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb"; + rev = "7b9f9ac9a76fa425ab27f2821377ef86571ca121"; + sha256 = "1p3744fxgvs12sqwvi8hhainwrgvhdfwmbyqf0sp0aq3awq3q1v9"; }; libName = "stackable_telemetry"; authors = [ @@ -11000,8 +11007,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "fb2d86579f4e3df008f78f0e527a012243483a2d"; - sha256 = "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb"; + rev = "7b9f9ac9a76fa425ab27f2821377ef86571ca121"; + sha256 = "1p3744fxgvs12sqwvi8hhainwrgvhdfwmbyqf0sp0aq3awq3q1v9"; }; libName = "stackable_versioned"; authors = [ @@ -11050,8 +11057,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "fb2d86579f4e3df008f78f0e527a012243483a2d"; - sha256 = "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb"; + rev = "7b9f9ac9a76fa425ab27f2821377ef86571ca121"; + sha256 = "1p3744fxgvs12sqwvi8hhainwrgvhdfwmbyqf0sp0aq3awq3q1v9"; }; procMacro = true; libName = "stackable_versioned_macros"; @@ -11118,8 +11125,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "fb2d86579f4e3df008f78f0e527a012243483a2d"; - sha256 = "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb"; + rev = "7b9f9ac9a76fa425ab27f2821377ef86571ca121"; + sha256 = "1p3744fxgvs12sqwvi8hhainwrgvhdfwmbyqf0sp0aq3awq3q1v9"; }; libName = "stackable_webhook"; authors = [ @@ -11501,18 +11508,18 @@ rec { ]; }; - "thiserror 2.0.19" = rec { + "thiserror 2.0.20" = rec { crateName = "thiserror"; - version = "2.0.19"; + version = "2.0.20"; edition = "2021"; - sha256 = "1ngwxsjsa64v1n7vb90h2b0i3fqk1piwaf0z6fqdacqfhjc3b909"; + sha256 = "0kxs6p295jffxhzaxpxv1dwaaf5iqlm6sx8h0djp6ancbxgj71pc"; authors = [ "David Tolnay " ]; dependencies = [ { name = "thiserror-impl"; - packageId = "thiserror-impl 2.0.19"; + packageId = "thiserror-impl 2.0.20"; } ]; features = { @@ -11546,11 +11553,11 @@ rec { ]; }; - "thiserror-impl 2.0.19" = rec { + "thiserror-impl 2.0.20" = rec { crateName = "thiserror-impl"; - version = "2.0.19"; + version = "2.0.20"; edition = "2021"; - sha256 = "1ka10pqy1g8zy5al9m8yadg30jp8hx0q80j8awmd8131yw6gxjs3"; + sha256 = "1bwjc94gi0xn5jz26h1a8bjj1wdkvvr6jifamyc4mp9n28zcs15w"; procMacro = true; libName = "thiserror_impl"; authors = [ @@ -11699,9 +11706,9 @@ rec { }; "tinystr" = rec { crateName = "tinystr"; - version = "0.8.3"; + version = "0.8.4"; edition = "2021"; - sha256 = "0vfr8x285w6zsqhna0a9jyhylwiafb2kc8pj2qaqaahw48236cn8"; + sha256 = "0hzncw8rgk4syla79qscfml46jm7ll1zdp7kdacc42cj8n8prqmi"; authors = [ "The ICU4X Project Developers" ]; @@ -12782,7 +12789,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 2.0.19"; + packageId = "thiserror 2.0.20"; } { name = "time"; @@ -13317,9 +13324,9 @@ rec { }; "uuid" = rec { crateName = "uuid"; - version = "1.24.0"; + version = "1.24.1"; edition = "2021"; - sha256 = "0faj5x0zgri8m3i8dv9qgyhiwqwdyhbl2g351cp3iin4ynk26fdz"; + sha256 = "1n8b7fg7dbx6ws64387l2i0qq900rw9b7qax63acdh37sczw1vrc"; authors = [ "Ashley Mannix" "Dylan DPC" @@ -13483,9 +13490,9 @@ rec { }; "wasm-bindgen" = rec { crateName = "wasm-bindgen"; - version = "0.2.126"; + version = "0.2.127"; edition = "2021"; - sha256 = "197rma4qg1kb8l4bl7857pgszzval8s1w740g9myyjh92467q1jb"; + sha256 = "0w6fa1mkbb6qlkffgy4qaz0hdf496zbjkyiyvs4lvmpd8xbr6w0v"; libName = "wasm_bindgen"; authors = [ "The wasm-bindgen Developers" @@ -13534,9 +13541,9 @@ rec { }; "wasm-bindgen-futures" = rec { crateName = "wasm-bindgen-futures"; - version = "0.4.76"; + version = "0.4.77"; edition = "2021"; - sha256 = "0799v92cpaprapnmpaflc51sdnz362q2fsjdqnwiq8ij1wsg2bf6"; + sha256 = "0l3r8m335kb2p8yj65kb0biwlypcx3ay4g750hafkl13rkapfxvb"; libName = "wasm_bindgen_futures"; authors = [ "The wasm-bindgen Developers" @@ -13562,9 +13569,9 @@ rec { }; "wasm-bindgen-macro" = rec { crateName = "wasm-bindgen-macro"; - version = "0.2.126"; + version = "0.2.127"; edition = "2021"; - sha256 = "1cda6wl5zyiy7777cfgrix7fhpaqba55l5zpqj4zig7ng7jyaz0n"; + sha256 = "1hcvlb6bv771fvgifd367wd0cm4giyar8fq5i4h705vj7y7myxvp"; procMacro = true; libName = "wasm_bindgen_macro"; authors = [ @@ -13586,9 +13593,9 @@ rec { }; "wasm-bindgen-macro-support" = rec { crateName = "wasm-bindgen-macro-support"; - version = "0.2.126"; + version = "0.2.127"; edition = "2021"; - sha256 = "03iq412frl2py55skwb3ya08xha0cf6q22zr5kqlwbr675w7r6gk"; + sha256 = "112j4d7dv8y2sk9yy9czrl9fpjx9388ywnn7icdv2bywazw367g1"; libName = "wasm_bindgen_macro_support"; authors = [ "The wasm-bindgen Developers" @@ -13622,10 +13629,10 @@ rec { }; "wasm-bindgen-shared" = rec { crateName = "wasm-bindgen-shared"; - version = "0.2.126"; + version = "0.2.127"; edition = "2021"; links = "wasm_bindgen"; - sha256 = "097a3kbjls447s1lwr41l21x5crrh5vq3h6zsxccz7slrjq4q6yw"; + sha256 = "1gywp6xv8a27fvm3ga9xby93xyic3hc2s626b9z9rw2xqny4vxky"; libName = "wasm_bindgen_shared"; authors = [ "The wasm-bindgen Developers" @@ -13640,9 +13647,9 @@ rec { }; "web-sys" = rec { crateName = "web-sys"; - version = "0.3.103"; + version = "0.3.104"; edition = "2021"; - sha256 = "0hb1zdnrp99p5r5q66jagsddmwha460yv2wklvzrzk0b3jvdq8l6"; + sha256 = "0c0acbvaqzqf21q5vdff2g74fvb7afi91xjplmclybq4d24k6df4"; libName = "web_sys"; authors = [ "The wasm-bindgen Developers" @@ -13898,6 +13905,10 @@ rec { "MouseEvent" = [ "Event" "UiEvent" ]; "MouseScrollEvent" = [ "Event" "MouseEvent" "UiEvent" ]; "MutationEvent" = [ "Event" ]; + "NavigateEvent" = [ "Event" ]; + "Navigation" = [ "EventTarget" ]; + "NavigationCurrentEntryChangeEvent" = [ "Event" ]; + "NavigationHistoryEntry" = [ "EventTarget" ]; "NetworkInformation" = [ "EventTarget" ]; "Node" = [ "EventTarget" ]; "Notification" = [ "EventTarget" ]; @@ -15020,9 +15031,9 @@ rec { }; "writeable" = rec { crateName = "writeable"; - version = "0.6.3"; + version = "0.6.4"; edition = "2021"; - sha256 = "1i54d13h9bpap2hf13xcry1s4lxh7ap3923g8f3c0grd7c9fbyhz"; + sha256 = "1p3r4s4wbf3dksfpj3xyrn7id5p0f7r74mj6qx6ngjfd6cm2vn1s"; authors = [ "The ICU4X Project Developers" ]; @@ -15350,9 +15361,9 @@ rec { }; "zerotrie" = rec { crateName = "zerotrie"; - version = "0.2.4"; + version = "0.2.5"; edition = "2021"; - sha256 = "1gr0pkcn3qsr6in6iixqyp0vbzwf2j1jzyvh7yl2yydh3p9m548g"; + sha256 = "0gss16krjzk22m57dz5hkdjg99ibj6pa41qr68na7w1jpp1nk8jf"; authors = [ "The ICU4X Project Developers" ]; @@ -15390,9 +15401,9 @@ rec { }; "zerovec" = rec { crateName = "zerovec"; - version = "0.11.6"; + version = "0.11.7"; edition = "2021"; - sha256 = "0fdjsy6b31q9i0d73sl7xjd12xadbwi45lkpfgqnmasrqg5i3ych"; + sha256 = "1n4n109wgbbin5hljq6gmbnqqg74yp9igzf40gbw2rkdjyswddcl"; authors = [ "The ICU4X Project Developers" ]; @@ -15436,9 +15447,9 @@ rec { }; "zerovec-derive" = rec { crateName = "zerovec-derive"; - version = "0.11.3"; + version = "0.11.5"; edition = "2021"; - sha256 = "0m85qj92mmfvhjra6ziqky5b1p4kcmp5069k7kfadp5hr8jw8pb2"; + sha256 = "1a8pz516ddcgxvxq3j1xgprac5wnprlrbyzsgzarj0423la2l8cz"; procMacro = true; libName = "zerovec_derive"; authors = [ @@ -15455,7 +15466,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.119"; + packageId = "syn 3.0.3"; features = [ "extra-traits" ]; } ]; diff --git a/Cargo.toml b/Cargo.toml index 1a1c498f..cac97bdd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ edition = "2024" repository = "https://github.com/stackabletech/nifi-operator" [workspace.dependencies] -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.115.0", features = ["webhook"] } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.116.0", features = ["webhook"] } anyhow = "1.0" built = { version = "0.8", features = ["chrono", "git2"] } diff --git a/crate-hashes.json b/crate-hashes.json index 43cd4b72..3fae0f9f 100644 --- a/crate-hashes.json +++ b/crate-hashes.json @@ -1,11 +1,11 @@ { - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#k8s-version@0.1.3": "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#stackable-certs@0.4.1": "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#stackable-operator-derive@0.3.1": "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#stackable-operator@0.115.0": "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#stackable-shared@0.1.2": "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#stackable-telemetry@0.6.5": "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#stackable-versioned-macros@0.11.1": "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#stackable-versioned@0.11.1": "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.115.0#stackable-webhook@0.9.2": "1w57n5xx0ik63r252l1v5ymm51jlsf7v4pj682b902k8vinlhyqb" + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.116.0#k8s-version@0.1.3": "1p3744fxgvs12sqwvi8hhainwrgvhdfwmbyqf0sp0aq3awq3q1v9", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.116.0#stackable-certs@0.4.1": "1p3744fxgvs12sqwvi8hhainwrgvhdfwmbyqf0sp0aq3awq3q1v9", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.116.0#stackable-operator-derive@0.3.1": "1p3744fxgvs12sqwvi8hhainwrgvhdfwmbyqf0sp0aq3awq3q1v9", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.116.0#stackable-operator@0.116.0": "1p3744fxgvs12sqwvi8hhainwrgvhdfwmbyqf0sp0aq3awq3q1v9", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.116.0#stackable-shared@0.1.2": "1p3744fxgvs12sqwvi8hhainwrgvhdfwmbyqf0sp0aq3awq3q1v9", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.116.0#stackable-telemetry@0.6.5": "1p3744fxgvs12sqwvi8hhainwrgvhdfwmbyqf0sp0aq3awq3q1v9", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.116.0#stackable-versioned-macros@0.11.1": "1p3744fxgvs12sqwvi8hhainwrgvhdfwmbyqf0sp0aq3awq3q1v9", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.116.0#stackable-versioned@0.11.1": "1p3744fxgvs12sqwvi8hhainwrgvhdfwmbyqf0sp0aq3awq3q1v9", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.116.0#stackable-webhook@0.9.2": "1p3744fxgvs12sqwvi8hhainwrgvhdfwmbyqf0sp0aq3awq3q1v9" } \ No newline at end of file diff --git a/extra/crds.yaml b/extra/crds.yaml index 5190da3a..7fe4ca70 100644 --- a/extra/crds.yaml +++ b/extra/crds.yaml @@ -1255,7 +1255,8 @@ spec: default: {} description: |- `envOverrides` configure environment variables to be set in the Pods. - It is a map from strings to strings - environment variables and the value to set. + It is a map from environment variable names to their values. The names are validated to be + valid environment variable names. Read the [environment variable overrides documentation](https://docs.stackable.tech/home/nightly/concepts/overrides#env-overrides) for more information and consult the operator specific usage guide to find out about @@ -2117,7 +2118,8 @@ spec: default: {} description: |- `envOverrides` configure environment variables to be set in the Pods. - It is a map from strings to strings - environment variables and the value to set. + It is a map from environment variable names to their values. The names are validated to be + valid environment variable names. Read the [environment variable overrides documentation](https://docs.stackable.tech/home/nightly/concepts/overrides#env-overrides) for more information and consult the operator specific usage guide to find out about diff --git a/rust/operator-binary/src/controller/apply.rs b/rust/operator-binary/src/controller/apply.rs index 065af25d..2974063e 100644 --- a/rust/operator-binary/src/controller/apply.rs +++ b/rust/operator-binary/src/controller/apply.rs @@ -12,8 +12,8 @@ use stackable_operator::{ use strum::{EnumDiscriminants, IntoStaticStr}; use crate::controller::{ - Applied, KubernetesResources, Prepared, ValidatedCluster, controller_name, operator_name, - product_name, + Applied, CONTROLLER_NAME, KubernetesResources, OPERATOR_NAME, PRODUCT_NAME, Prepared, + ValidatedCluster, }; #[derive(Snafu, Debug, EnumDiscriminants)] @@ -49,9 +49,9 @@ impl<'a> Applier<'a> { object_overrides: &'a ObjectOverrides, ) -> Applier<'a> { let cluster_resources = cluster_resources_new( - &product_name(), - &operator_name(), - &controller_name(), + &PRODUCT_NAME, + &OPERATOR_NAME, + &CONTROLLER_NAME, &cluster.name, &cluster.namespace, &cluster.uid, diff --git a/rust/operator-binary/src/controller/build.rs b/rust/operator-binary/src/controller/build.rs index fab731cb..405e933f 100644 --- a/rust/operator-binary/src/controller/build.rs +++ b/rust/operator-binary/src/controller/build.rs @@ -2,7 +2,7 @@ //! //! [`ValidatedCluster`]: crate::controller::ValidatedCluster -use std::{marker::PhantomData, str::FromStr}; +use std::marker::PhantomData; use snafu::{ResultExt, Snafu}; use stackable_operator::{ @@ -10,13 +10,18 @@ use stackable_operator::{ kvp::Labels, v2::{ builder::meta::ownerreference_from_resource, - types::{common::Port, operator::RoleGroupName}, + kvp::label, + types::{ + common::Port, + operator::{RoleGroupName, RoleName}, + }, }, }; use crate::{ controller::{ - KubernetesResources, Prepared, ValidatedCluster, + CONTROLLER_NAME, KubernetesResources, OPERATOR_NAME, PRODUCT_NAME, Prepared, + ValidatedCluster, build::resource::{ config_map::build_rolegroup_config_map, listener::{build_group_listener, group_listener_name}, @@ -37,10 +42,6 @@ pub mod properties; pub mod proxy_hosts; pub mod resource; -// Placeholder role-group name for role-level resources (e.g. the per-role `Listener`), which have -// no associated role group. Preserves the historical `app.kubernetes.io/role-group: none` label. -stackable_operator::constant!(pub(crate) PLACEHOLDER_LISTENER_ROLE_GROUP: RoleGroupName = "none"); - pub const HTTPS_PORT_NAME: &str = "https"; pub const HTTPS_PORT: Port = Port(8443); pub const PROTOCOL_PORT_NAME: &str = "protocol"; @@ -110,7 +111,7 @@ pub fn build(cluster: &ValidatedCluster) -> Result listeners.push(build_group_listener( cluster, role_config.listener_class.clone(), - group_listener_name(cluster, &nifi_role.to_string()), + group_listener_name(cluster, &nifi_role), )); for (role_group_name, rg) in node_role_group_configs { @@ -152,8 +153,8 @@ pub fn build(cluster: &ValidatedCluster) -> Result /// need extra labels/annotations chain them onto the returned builder. The labels are passed in /// rather than derived here, so callers can pick the variant they need: role-level resources /// (e.g. the per-role [`Listener`](stackable_operator::crd::listener::v1alpha1::Listener)) use the -/// placeholder role group `none`, and resources that must not change after deployment use the -/// unversioned labels. +/// role-level labels, and resources that must not change after deployment use the unversioned +/// labels. pub(crate) fn object_meta( cluster: &ValidatedCluster, name: impl Into, @@ -168,6 +169,70 @@ pub(crate) fn object_meta( builder } +pub(crate) fn recommended_labels_for_cluster_resources(cluster: &ValidatedCluster) -> Labels { + label::recommended_labels_for_cluster_resources( + &cluster.name, + &PRODUCT_NAME, + &cluster.product_version, + &OPERATOR_NAME, + &CONTROLLER_NAME, + ) +} + +pub(crate) fn recommended_labels_for_role_resources( + cluster: &ValidatedCluster, + role_name: &RoleName, +) -> Labels { + label::recommended_labels_for_role_resources( + &cluster.name, + &PRODUCT_NAME, + &cluster.product_version, + &OPERATOR_NAME, + &CONTROLLER_NAME, + role_name, + ) +} + +pub(crate) fn recommended_labels_for_role_group_resources( + cluster: &ValidatedCluster, + role_name: &RoleName, + role_group_name: &RoleGroupName, +) -> Labels { + label::recommended_labels_for_role_group_resources( + &cluster.name, + &PRODUCT_NAME, + &cluster.product_version, + &OPERATOR_NAME, + &CONTROLLER_NAME, + role_name, + role_group_name, + ) +} + +pub(crate) fn recommended_labels_for_unversioned_role_group_resources( + cluster: &ValidatedCluster, + role_name: &RoleName, + role_group_name: &RoleGroupName, +) -> Labels { + label::recommended_labels_for_unversioned_role_group_resources( + &cluster.name, + &PRODUCT_NAME, + &OPERATOR_NAME, + &CONTROLLER_NAME, + role_name, + role_group_name, + ) +} + +/// Selector labels matching the pods of a role group. +pub(crate) fn role_group_selector( + cluster: &ValidatedCluster, + role_name: &RoleName, + role_group_name: &RoleGroupName, +) -> Labels { + label::role_group_selector(&cluster.name, &PRODUCT_NAME, role_name, role_group_name) +} + #[cfg(test)] mod tests { use stackable_operator::kube::Resource; diff --git a/rust/operator-binary/src/controller/build/properties.rs b/rust/operator-binary/src/controller/build/properties.rs index b932dc25..d183ce50 100644 --- a/rust/operator-binary/src/controller/build/properties.rs +++ b/rust/operator-binary/src/controller/build/properties.rs @@ -159,8 +159,18 @@ pub(crate) mod test_support { /// - Kubernetes clustering backend /// - Default `NifiArgon2AesGcm256` sensitive-properties algorithm pub fn minimal_validated_cluster() -> ValidatedCluster { - let nifi: v1alpha1::NifiCluster = - serde_yaml::from_str(MINIMAL_NIFI_YAML).expect("invalid test YAML"); + validated_cluster_from_yaml(MINIMAL_NIFI_YAML) + } + + /// Build a [`ValidatedCluster`] from the given NifiCluster YAML (without Kubernetes API + /// access), running the real role-group validation ([`build_role_group_configs`]) on it. + /// + /// Everything outside the role groups is fixed to the [`MINIMAL_NIFI_YAML`] fixture values: + /// the given YAML must keep the cluster name (`simple-nifi`), the namespace (`default`) and + /// the product version (`2.9.0`). Use this for fixtures that vary role or role-group + /// settings (e.g. `envOverrides`), and [`minimal_validated_cluster`] otherwise. + pub fn validated_cluster_from_yaml(yaml: &str) -> ValidatedCluster { + let nifi: v1alpha1::NifiCluster = serde_yaml::from_str(yaml).expect("invalid test YAML"); // Mirrors what `image.resolve()` produces in production, so label-asserting tests see // realistic values. diff --git a/rust/operator-binary/src/controller/build/properties/nifi_properties.rs b/rust/operator-binary/src/controller/build/properties/nifi_properties.rs index 32b9cabc..73899ab4 100644 --- a/rust/operator-binary/src/controller/build/properties/nifi_properties.rs +++ b/rust/operator-binary/src/controller/build/properties/nifi_properties.rs @@ -538,13 +538,13 @@ pub fn build( // this will be replaced via a container command script properties.insert( "nifi.zookeeper.connect.string".to_string(), - env_reference(ZOOKEEPER_HOSTS_ENV), + env_reference(ZOOKEEPER_HOSTS_ENV.as_ref()), ); // this will be replaced via a container command script properties.insert( "nifi.zookeeper.root.node".to_string(), - env_reference(ZOOKEEPER_CHROOT_ENV), + env_reference(ZOOKEEPER_CHROOT_ENV.as_ref()), ); } @@ -557,7 +557,7 @@ pub fn build( // this will be replaced via a container command script properties.insert( "nifi.cluster.leader.election.kubernetes.lease.prefix".to_string(), - env_reference(STACKLET_NAME_ENV), + env_reference(STACKLET_NAME_ENV.as_ref()), ); } } diff --git a/rust/operator-binary/src/controller/build/properties/state_management_xml.rs b/rust/operator-binary/src/controller/build/properties/state_management_xml.rs index 394be68f..e96b35ab 100644 --- a/rust/operator-binary/src/controller/build/properties/state_management_xml.rs +++ b/rust/operator-binary/src/controller/build/properties/state_management_xml.rs @@ -62,7 +62,7 @@ mod tests { let xml = build(&NifiClusteringBackend::Kubernetes {}); assert!(xml.contains(KUBERNETES_STATE_PROVIDER_ID)); assert!(xml.contains("KubernetesConfigMapStateProvider")); - assert!(xml.contains(&env_reference(STACKLET_NAME_ENV))); + assert!(xml.contains(&env_reference(STACKLET_NAME_ENV.as_ref()))); assert!(!xml.contains(ZOOKEEPER_STATE_PROVIDER_ID)); } @@ -74,8 +74,8 @@ mod tests { }); assert!(xml.contains(ZOOKEEPER_STATE_PROVIDER_ID)); assert!(xml.contains("ZooKeeperStateProvider")); - assert!(xml.contains(&env_reference(ZOOKEEPER_HOSTS_ENV))); - assert!(xml.contains(&env_reference(ZOOKEEPER_CHROOT_ENV))); + assert!(xml.contains(&env_reference(ZOOKEEPER_HOSTS_ENV.as_ref()))); + assert!(xml.contains(&env_reference(ZOOKEEPER_CHROOT_ENV.as_ref()))); assert!(!xml.contains(KUBERNETES_STATE_PROVIDER_ID)); } } diff --git a/rust/operator-binary/src/controller/build/resource/config_map.rs b/rust/operator-binary/src/controller/build/resource/config_map.rs index 86d96da9..d12e3b6f 100644 --- a/rust/operator-binary/src/controller/build/resource/config_map.rs +++ b/rust/operator-binary/src/controller/build/resource/config_map.rs @@ -6,16 +6,19 @@ use stackable_operator::{ product_logging::framework::VECTOR_CONFIG_FILE, v2::types::operator::RoleGroupName, }; -use crate::controller::{ - NifiRoleGroupConfig, ValidatedCluster, - build::{ - object_meta, - properties::{ - ConfigFileName, authorizers, bootstrap_conf, login_identity_providers, nifi_properties, - product_logging, security_properties, state_management_xml, +use crate::{ + controller::{ + NifiRoleGroupConfig, ValidatedCluster, + build::{ + object_meta, + properties::{ + ConfigFileName, authorizers, bootstrap_conf, login_identity_providers, + nifi_properties, product_logging, security_properties, state_management_xml, + }, + proxy_hosts, recommended_labels_for_role_group_resources, }, - proxy_hosts, }, + crd::NifiRole, }; #[derive(Debug, Snafu)] @@ -73,7 +76,11 @@ pub fn build_rolegroup_config_map( .role_group_resource_names(role_group_name) .role_group_config_map() .to_string(), - cluster.recommended_labels(role_group_name), + recommended_labels_for_role_group_resources( + cluster, + &NifiRole::Node, + role_group_name, + ), ) .build(), ) diff --git a/rust/operator-binary/src/controller/build/resource/listener.rs b/rust/operator-binary/src/controller/build/resource/listener.rs index 38d91ad2..cd3de3de 100644 --- a/rust/operator-binary/src/controller/build/resource/listener.rs +++ b/rust/operator-binary/src/controller/build/resource/listener.rs @@ -8,13 +8,19 @@ use stackable_operator::{ builder::pod::volume::{ ListenerReference, listener_operator_volume_source_builder_build_pvc, }, - types::kubernetes::{ListenerClassName, ListenerName, PersistentVolumeClaimName}, + types::{ + kubernetes::{ListenerClassName, ListenerName, PersistentVolumeClaimName}, + operator::RoleName, + }, }, }; -use crate::controller::{ - ValidatedCluster, - build::{HTTPS_PORT, HTTPS_PORT_NAME, PLACEHOLDER_LISTENER_ROLE_GROUP, object_meta}, +use crate::{ + controller::{ + ValidatedCluster, + build::{HTTPS_PORT, HTTPS_PORT_NAME, object_meta, recommended_labels_for_role_resources}, + }, + crd::NifiRole, }; pub const LISTENER_VOLUME_NAME: &str = "listener"; @@ -32,7 +38,9 @@ pub fn build_group_listener( metadata: object_meta( cluster, listener_group_name.to_string(), - cluster.recommended_labels(&PLACEHOLDER_LISTENER_ROLE_GROUP), + // The group listener is a role-level (not role-group-level) object, so it carries + // the role-level recommended labels. + recommended_labels_for_role_resources(cluster, &NifiRole::Node), ) .build(), spec: ListenerSpec { @@ -59,10 +67,23 @@ pub fn build_group_listener_pvc( ) } -pub fn group_listener_name(cluster: &ValidatedCluster, role_name: &String) -> ListenerName { +pub fn group_listener_name(cluster: &ValidatedCluster, role_name: &RoleName) -> ListenerName { ListenerName::from_str(&format!( "{cluster_name}-{role_name}", cluster_name = cluster.name )) - .expect("the cluster name and role name form a valid listener name") + .expect( + "the cluster name and role name form a valid Listener name, because both are length-bounded types whose combined length stays within the Listener name limit", + ) +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn test_constants() { + // Test that dereferencing the constants does not panic. + let _ = *LISTENER_PVC_NAME; + } } diff --git a/rust/operator-binary/src/controller/build/resource/pdb.rs b/rust/operator-binary/src/controller/build/resource/pdb.rs index ec44cd3c..76fb8ae3 100644 --- a/rust/operator-binary/src/controller/build/resource/pdb.rs +++ b/rust/operator-binary/src/controller/build/resource/pdb.rs @@ -4,7 +4,7 @@ use stackable_operator::{ }; use crate::{ - controller::{ValidatedCluster, controller_name, operator_name, product_name}, + controller::{CONTROLLER_NAME, OPERATOR_NAME, PRODUCT_NAME, ValidatedCluster}, crd::NifiRole, }; @@ -22,10 +22,10 @@ pub fn build_pdb( }); let pdb = pod_disruption_budget_builder_with_role( cluster, - &product_name(), - &role.into(), - &operator_name(), - &controller_name(), + &PRODUCT_NAME, + role, + &OPERATOR_NAME, + &CONTROLLER_NAME, ) .with_max_unavailable(max_unavailable) .build(); diff --git a/rust/operator-binary/src/controller/build/resource/rbac.rs b/rust/operator-binary/src/controller/build/resource/rbac.rs index 10ccdc02..3558391e 100644 --- a/rust/operator-binary/src/controller/build/resource/rbac.rs +++ b/rust/operator-binary/src/controller/build/resource/rbac.rs @@ -5,7 +5,7 @@ use stackable_operator::{ v2::rbac, }; -use crate::controller::ValidatedCluster; +use crate::controller::{ValidatedCluster, build::recommended_labels_for_cluster_resources}; /// Builds the [`ServiceAccount`] that the role-group Pods run under. /// @@ -15,7 +15,7 @@ pub fn build_service_account(cluster: &ValidatedCluster) -> ServiceAccount { rbac::build_service_account( cluster, &cluster.cluster_resource_names(), - cluster.cluster_shared_recommended_labels(), + recommended_labels_for_cluster_resources(cluster), ) } @@ -25,7 +25,7 @@ pub fn build_role_binding(cluster: &ValidatedCluster) -> RoleBinding { rbac::build_role_binding( cluster, &cluster.cluster_resource_names(), - cluster.cluster_shared_recommended_labels(), + recommended_labels_for_cluster_resources(cluster), ) } @@ -51,11 +51,9 @@ mod tests { "metadata": { // The RBAC resources are cluster-shared, so role and role group are `none`. "labels": { - "app.kubernetes.io/component": "none", "app.kubernetes.io/instance": "simple-nifi", "app.kubernetes.io/managed-by": "nifi.stackable.tech_nificluster", "app.kubernetes.io/name": "nifi", - "app.kubernetes.io/role-group": "none", "app.kubernetes.io/version": app_version_label("2.9.0"), "stackable.tech/vendor": "Stackable" }, @@ -86,11 +84,9 @@ mod tests { "kind": "RoleBinding", "metadata": { "labels": { - "app.kubernetes.io/component": "none", "app.kubernetes.io/instance": "simple-nifi", "app.kubernetes.io/managed-by": "nifi.stackable.tech_nificluster", "app.kubernetes.io/name": "nifi", - "app.kubernetes.io/role-group": "none", "app.kubernetes.io/version": app_version_label("2.9.0"), "stackable.tech/vendor": "Stackable" }, diff --git a/rust/operator-binary/src/controller/build/resource/secret.rs b/rust/operator-binary/src/controller/build/resource/secret.rs index 54d21387..e5ce29d9 100644 --- a/rust/operator-binary/src/controller/build/resource/secret.rs +++ b/rust/operator-binary/src/controller/build/resource/secret.rs @@ -22,7 +22,7 @@ use stackable_operator::{ }; use crate::{ - controller::ValidatedCluster, + controller::{ValidatedCluster, build::recommended_labels_for_cluster_resources}, security::authentication::{NifiAuthenticationConfig, STACKABLE_ADMIN_USERNAME}, }; @@ -120,7 +120,7 @@ fn secret_meta(cluster: &ValidatedCluster, name: &str) -> ObjectMeta { ObjectMetaBuilder::new() .name_and_namespace(cluster) .name(name) - .with_labels(cluster.cluster_shared_recommended_labels()) + .with_labels(recommended_labels_for_cluster_resources(cluster)) .build() } @@ -297,11 +297,9 @@ mod tests { serde_json::json!({ // The Secrets are cluster-shared, so role and role group are `none`. "labels": { - "app.kubernetes.io/component": "none", "app.kubernetes.io/instance": "simple-nifi", "app.kubernetes.io/managed-by": "nifi.stackable.tech_nificluster", "app.kubernetes.io/name": "nifi", - "app.kubernetes.io/role-group": "none", "app.kubernetes.io/version": app_version_label("2.9.0"), "stackable.tech/vendor": "Stackable" }, diff --git a/rust/operator-binary/src/controller/build/resource/service.rs b/rust/operator-binary/src/controller/build/resource/service.rs index f65a23f8..9389bd6e 100644 --- a/rust/operator-binary/src/controller/build/resource/service.rs +++ b/rust/operator-binary/src/controller/build/resource/service.rs @@ -7,9 +7,15 @@ use stackable_operator::{ }, }; -use crate::controller::{ - ValidatedCluster, - build::{HTTPS_PORT, HTTPS_PORT_NAME, object_meta}, +use crate::{ + controller::{ + ValidatedCluster, + build::{ + HTTPS_PORT, HTTPS_PORT_NAME, object_meta, recommended_labels_for_role_group_resources, + role_group_selector, + }, + }, + crd::NifiRole, }; /// The rolegroup headless [`Service`] is a service that allows direct access to the instances of a certain rolegroup @@ -25,7 +31,7 @@ pub fn build_rolegroup_headless_service( .role_group_resource_names(role_group_name) .headless_service_name() .to_string(), - cluster.recommended_labels(role_group_name), + recommended_labels_for_role_group_resources(cluster, &NifiRole::Node, role_group_name), ) .build(), spec: Some(ServiceSpec { @@ -33,7 +39,7 @@ pub fn build_rolegroup_headless_service( type_: Some("ClusterIP".to_string()), cluster_ip: Some("None".to_string()), ports: Some(vec![headless_service_port()]), - selector: Some(cluster.role_group_selector(role_group_name).into()), + selector: Some(role_group_selector(cluster, &NifiRole::Node, role_group_name).into()), publish_not_ready_addresses: Some(true), ..ServiceSpec::default() }), @@ -53,7 +59,7 @@ pub fn build_rolegroup_metrics_service( .role_group_resource_names(role_group_name) .metrics_service_name() .to_string(), - cluster.recommended_labels(role_group_name), + recommended_labels_for_role_group_resources(cluster, &NifiRole::Node, role_group_name), ) .with_labels(service::prometheus_labels(&Scraping::Enabled)) .with_annotations(prometheus_annotations()) @@ -63,7 +69,7 @@ pub fn build_rolegroup_metrics_service( type_: Some("ClusterIP".to_string()), cluster_ip: Some("None".to_string()), ports: Some(vec![metrics_service_port()]), - selector: Some(cluster.role_group_selector(role_group_name).into()), + selector: Some(role_group_selector(cluster, &NifiRole::Node, role_group_name).into()), publish_not_ready_addresses: Some(true), ..ServiceSpec::default() }), diff --git a/rust/operator-binary/src/controller/build/resource/statefulset.rs b/rust/operator-binary/src/controller/build/resource/statefulset.rs index 656bb0af..af5d7f1d 100644 --- a/rust/operator-binary/src/controller/build/resource/statefulset.rs +++ b/rust/operator-binary/src/controller/build/resource/statefulset.rs @@ -9,7 +9,7 @@ use stackable_operator::{ self, meta::ObjectMetaBuilder, pod::{ - PodBuilder, resources::ResourceRequirementsBuilder, + PodBuilder, container::FieldPathEnvVar, resources::ResourceRequirementsBuilder, security::PodSecurityContextBuilder, volume::SecretFormat, }, }, @@ -20,9 +20,8 @@ use stackable_operator::{ api::{ apps::v1::{StatefulSet, StatefulSetSpec, StatefulSetUpdateStrategy}, core::v1::{ - ConfigMapKeySelector, ConfigMapVolumeSource, EmptyDirVolumeSource, EnvVar, - EnvVarSource, ObjectFieldSelector, PersistentVolumeClaim, SecretVolumeSource, - Volume, + ConfigMapVolumeSource, EmptyDirVolumeSource, EnvVar, PersistentVolumeClaim, + SecretVolumeSource, Volume, }, }, apimachinery::pkg::apis::meta::v1::LabelSelector, @@ -34,12 +33,12 @@ use stackable_operator::{ }, utils::COMMON_BASH_TRAP_FUNCTIONS, v2::{ - builder::pod::container::{EnvVarSet, new_container_builder}, + builder::pod::container::{EnvVarName, EnvVarSet, new_container_builder}, product_logging::framework::{ STACKABLE_LOG_DIR, ValidatedContainerLogConfigChoice, vector_container, }, types::{ - kubernetes::{ContainerName, VolumeName}, + kubernetes::{ConfigMapKey, ContainerName, VolumeName}, operator::RoleGroupName, }, }, @@ -55,6 +54,8 @@ use crate::{ graceful_shutdown::add_graceful_shutdown_config, object_meta, properties::ConfigFileName, + recommended_labels_for_role_group_resources, + recommended_labels_for_unversioned_role_group_resources, resource::{ listener::{ LISTENER_VOLUME_DIR, LISTENER_VOLUME_NAME, build_group_listener_pvc, @@ -64,6 +65,7 @@ use crate::{ management_readiness_probe, management_startup_probe, tcp_liveness_probe, }, }, + role_group_selector, }, }, crd::{ @@ -158,13 +160,27 @@ stackable_operator::constant!(VECTOR_CONTAINER_NAME: ContainerName = "vector"); stackable_operator::constant!(VECTOR_LOG_CONFIG_VOLUME_NAME: VolumeName = "config"); stackable_operator::constant!(VECTOR_LOG_VOLUME_NAME: VolumeName = "log"); -// Names of the environment variables injected into the NiFi container here (or exported by the -// prepare init-container) and referenced as `${env:...}` placeholders by the config-file builders -// (`nifi.properties`, `state-management.xml`, proxy hosts). The two sides must agree. -pub(crate) const STACKLET_NAME_ENV: &str = "STACKLET_NAME"; +// Names of the environment variables injected into the NiFi container here and referenced as +// `${env:...}` placeholders by the config-file builders (`nifi.properties`, +// `state-management.xml`). The two sides must agree. +stackable_operator::constant!(pub(crate) STACKLET_NAME_ENV: EnvVarName = "STACKLET_NAME"); +stackable_operator::constant!(pub(crate) ZOOKEEPER_HOSTS_ENV: EnvVarName = "ZOOKEEPER_HOSTS"); +stackable_operator::constant!(pub(crate) ZOOKEEPER_CHROOT_ENV: EnvVarName = "ZOOKEEPER_CHROOT"); + +// The ZooKeeper env var names double as the keys of the ZooKeeper discovery ConfigMap the +// values are mounted from (the same strings, as the env var names are used as the keys). +stackable_operator::constant!(ZOOKEEPER_HOSTS_CONFIG_MAP_KEY: ConfigMapKey = "ZOOKEEPER_HOSTS"); +stackable_operator::constant!(ZOOKEEPER_CHROOT_CONFIG_MAP_KEY: ConfigMapKey = "ZOOKEEPER_CHROOT"); + +// The POD_NAME env var is needed to overwrite `nifi.cluster.node.address` later. +stackable_operator::constant!(POD_NAME_ENV: EnvVarName = "POD_NAME"); +// Needed for the `containerdebug` process to log its tracing information to. +stackable_operator::constant!(CONTAINERDEBUG_LOG_DIRECTORY_ENV: EnvVarName = "CONTAINERDEBUG_LOG_DIRECTORY"); + +// Names of environment variables exported by shell commands in the containers (never set as +// Kubernetes `EnvVar`s by the operator) and referenced as `${env:...}` placeholders by the +// config-file builders. The sides must agree. pub(crate) const NODE_ADDRESS_ENV: &str = "NODE_ADDRESS"; -pub(crate) const ZOOKEEPER_HOSTS_ENV: &str = "ZOOKEEPER_HOSTS"; -pub(crate) const ZOOKEEPER_CHROOT_ENV: &str = "ZOOKEEPER_CHROOT"; pub(crate) const LISTENER_DEFAULT_ADDRESS_ENV: &str = "LISTENER_DEFAULT_ADDRESS"; pub(crate) const LISTENER_DEFAULT_PORT_HTTPS_ENV: &str = "LISTENER_DEFAULT_PORT_HTTPS"; @@ -194,63 +210,51 @@ pub(crate) fn build_node_rolegroup_statefulset( // sources the same `rg.config`. let merged_config = &rg.config; - let mut env_vars: Vec = rg.env_overrides.clone().into(); - - // we need the POD_NAME env var to overwrite `nifi.cluster.node.address` later - env_vars.push(EnvVar { - name: "POD_NAME".to_string(), - value_from: Some(EnvVarSource { - field_ref: Some(ObjectFieldSelector { - api_version: Some("v1".to_string()), - field_path: "metadata.name".to_string(), - }), - ..EnvVarSource::default() - }), - ..EnvVar::default() - }); - - // Needed for the `containerdebug` process to log it's tracing information to. - env_vars.push(EnvVar { - name: "CONTAINERDEBUG_LOG_DIRECTORY".to_string(), - value: Some(format!("{STACKABLE_LOG_DIR}/containerdebug")), - ..Default::default() - }); - - env_vars.push(EnvVar { - name: STACKLET_NAME_ENV.to_string(), - value: Some(cluster.name.to_string()), - ..Default::default() - }); + // All operator-set environment variables, collected into an `EnvVarSet` so that every name + // occurs only once. + let mut env = EnvVarSet::new() + .with_field_path(&POD_NAME_ENV, &FieldPathEnvVar::Name) + .with_value( + &CONTAINERDEBUG_LOG_DIRECTORY_ENV, + format!("{STACKABLE_LOG_DIR}/containerdebug"), + ) + .with_value(&STACKLET_NAME_ENV, cluster.name.to_string()); match &cluster.cluster_config.clustering_backend { v1alpha1::NifiClusteringBackend::ZooKeeper { zookeeper_config_map_name, } => { - let zookeeper_env_var = |name: &str| EnvVar { - name: name.to_string(), - value_from: Some(EnvVarSource { - config_map_key_ref: Some(ConfigMapKeySelector { - name: zookeeper_config_map_name.to_string(), - key: name.to_string(), - ..ConfigMapKeySelector::default() - }), - ..EnvVarSource::default() - }), - ..EnvVar::default() - }; - env_vars.push(zookeeper_env_var(ZOOKEEPER_HOSTS_ENV)); - env_vars.push(zookeeper_env_var(ZOOKEEPER_CHROOT_ENV)); + env = env + .with_config_map_key_ref( + &ZOOKEEPER_HOSTS_ENV, + zookeeper_config_map_name, + &ZOOKEEPER_HOSTS_CONFIG_MAP_KEY, + ) + .with_config_map_key_ref( + &ZOOKEEPER_CHROOT_ENV, + zookeeper_config_map_name, + &ZOOKEEPER_CHROOT_CONFIG_MAP_KEY, + ); } v1alpha1::NifiClusteringBackend::Kubernetes {} => {} } if let NifiAuthenticationConfig::Oidc { oidc, .. } = authentication_config { - env_vars.extend(AuthenticationProvider::client_credentials_env_var_mounts( + for env_var in AuthenticationProvider::client_credentials_env_var_mounts( oidc.client_credentials_secret_ref.clone(), - )); + ) { + env = env.with_env_var(env_var).expect( + "env_var name is valid because it is either OIDC_<16-hex-characters>_CLIENT_ID or OIDC_<16-hex-characters>_CLIENT_SECRET", + ); + } } - env_vars.extend(authorization_config.get_env_vars()); + env = env.merge(authorization_config.get_env_vars()); + + // Environment variable overrides (highest precedence), merged from role and role group. + // They are merged in last of all so that they override any operator-set environment + // variable; `EnvVarSet` is keyed by name, so an override replaces the operator's value. + let env_vars: Vec = env.merge(rg.env_overrides.clone()).into(); let node_address = format!( "$POD_NAME.{service_name}.{namespace}.svc.{cluster_domain}", @@ -449,7 +453,8 @@ pub(crate) fn build_node_rolegroup_statefulset( let mut pod_builder = PodBuilder::new(); - let recommended_object_labels = cluster.recommended_labels(role_group_name); + let recommended_object_labels = + recommended_labels_for_role_group_resources(cluster, &NifiRole::Node, role_group_name); add_graceful_shutdown_config(merged_config, &mut pod_builder).context(GracefulShutdownSnafu)?; @@ -463,7 +468,7 @@ pub(crate) fn build_node_rolegroup_statefulset( tracing::info!( ?volume_name, ?mount_point, - role = %NifiRole::Node, + role = NifiRole::Node.as_ref(), "Adding user specified extra volume", ); pod_builder @@ -653,7 +658,7 @@ pub(crate) fn build_node_rolegroup_statefulset( metadata: object_meta( cluster, resource_names.stateful_set_name().to_string(), - cluster.recommended_labels(role_group_name), + recommended_labels_for_role_group_resources(cluster, &NifiRole::Node, role_group_name), ) .with_label(RESTART_CONTROLLER_ENABLED_LABEL.to_owned()) .build(), @@ -661,7 +666,9 @@ pub(crate) fn build_node_rolegroup_statefulset( pod_management_policy: Some("Parallel".to_string()), replicas: effective_replicas, selector: LabelSelector { - match_labels: Some(cluster.role_group_selector(role_group_name).into()), + match_labels: Some( + role_group_selector(cluster, &NifiRole::Node, role_group_name).into(), + ), ..LabelSelector::default() }, service_name: Some(resource_names.headless_service_name().to_string()), @@ -707,15 +714,19 @@ fn get_volume_claim_templates( ), ]; - // Used for PVC templates that cannot be modified once they are deployed, so the version label - // is set to the placeholder `none` to keep the labels stable across version upgrades. - let unversioned_recommended_labels = cluster.unversioned_recommended_labels(role_group_name); + // Used for PVC templates, which cannot be modified once they are deployed. The version label + // is omitted so the labels stay stable across version upgrades. + let unversioned_recommended_labels = recommended_labels_for_unversioned_role_group_resources( + cluster, + &NifiRole::Node, + role_group_name, + ); // listener endpoints will use persistent volumes // so that load balancers can hard-code the target addresses and // that it is possible to connect to a consistent address pvcs.push(build_group_listener_pvc( - &group_listener_name(cluster, &NifiRole::Node.to_string()), + &group_listener_name(cluster, &NifiRole::Node), &unversioned_recommended_labels, )); @@ -732,3 +743,100 @@ fn get_volume_claim_templates( Ok(pvcs) } + +#[cfg(test)] +mod tests { + use super::*; + use crate::controller::build::properties::test_support::{ + default_rg, validated_cluster_from_yaml, + }; + + #[test] + fn test_constants() { + // Test that dereferencing the constants does not panic. + let _ = *CONFIG_VOLUME_NAME; + let _ = *ACTIVE_CONFIG_VOLUME_NAME; + let _ = *SENSITIVE_PROPERTY_VOLUME_NAME; + let _ = *LOG_CONFIG_VOLUME_NAME; + let _ = *LOG_VOLUME_NAME; + let _ = *PYTHON_WORKING_DIR_VOLUME_NAME; + let _ = *PREPARE_CONTAINER_NAME; + let _ = *NIFI_CONTAINER_NAME; + let _ = *VECTOR_CONTAINER_NAME; + let _ = *VECTOR_LOG_CONFIG_VOLUME_NAME; + let _ = *VECTOR_LOG_VOLUME_NAME; + let _ = *STACKLET_NAME_ENV; + let _ = *ZOOKEEPER_HOSTS_ENV; + let _ = *ZOOKEEPER_CHROOT_ENV; + let _ = *ZOOKEEPER_HOSTS_CONFIG_MAP_KEY; + let _ = *ZOOKEEPER_CHROOT_CONFIG_MAP_KEY; + let _ = *POD_NAME_ENV; + let _ = *CONTAINERDEBUG_LOG_DIRECTORY_ENV; + } + + /// `envOverrides` are applied after every operator-set environment variable, so users can + /// override any of them (previously the operator-set variables were appended after the + /// overrides, so the operator's values always took precedence). + /// `CONTAINERDEBUG_LOG_DIRECTORY` is used as the example here because it is set + /// unconditionally by the operator. + #[test] + fn env_overrides_take_precedence_over_operator_set_env_vars() { + // The minimal fixture cluster, plus an `envOverrides` entry on the `default` role group + // that collides with the operator-set `CONTAINERDEBUG_LOG_DIRECTORY`. + let cluster = validated_cluster_from_yaml( + r#" + apiVersion: nifi.stackable.tech/v1alpha1 + kind: NifiCluster + metadata: + name: simple-nifi + namespace: default + spec: + image: + productVersion: 2.9.0 + clusterConfig: + authentication: + - authenticationClass: nifi-admin-credentials-simple + sensitiveProperties: + keySecret: simple-nifi-sensitive-property-key + autoGenerate: true + nodes: + roleGroups: + default: + replicas: 1 + envOverrides: + CONTAINERDEBUG_LOG_DIRECTORY: /custom/log/dir + "#, + ); + let role_group_name = RoleGroupName::from_str("default").expect("valid role group name"); + let rg = default_rg(&cluster); + + let stateful_set = build_node_rolegroup_statefulset(&cluster, &role_group_name, rg, None) + .expect("the StatefulSet builds"); + + let containerdebug: Vec<(String, String)> = stateful_set + .spec + .expect("the StatefulSet has a spec") + .template + .spec + .expect("the pod template has a spec") + .containers + .into_iter() + .find(|container| container.name == NIFI_CONTAINER_NAME.to_string()) + .expect("the nifi container exists") + .env + .expect("the nifi container has env vars") + .into_iter() + .filter(|env_var| env_var.name == "CONTAINERDEBUG_LOG_DIRECTORY") + .map(|env_var| (env_var.name, env_var.value.unwrap_or_default())) + .collect(); + + // Exact comparison so a duplicate entry (operator value alongside the override) fails too. + assert_eq!( + containerdebug, + [( + "CONTAINERDEBUG_LOG_DIRECTORY".to_string(), + "/custom/log/dir".to_string() + )] + ); + } +} diff --git a/rust/operator-binary/src/controller/mod.rs b/rust/operator-binary/src/controller/mod.rs index a6993a3b..aa1e5086 100644 --- a/rust/operator-binary/src/controller/mod.rs +++ b/rust/operator-binary/src/controller/mod.rs @@ -2,7 +2,7 @@ //! [`validate`] step and consumed by the [`build`] steps, plus the //! `dereference` / `validate` / `build` sub-modules. -use std::{collections::BTreeMap, marker::PhantomData, str::FromStr as _}; +use std::{collections::BTreeMap, marker::PhantomData, ops::Deref as _, str::FromStr as _}; use stackable_operator::{ commons::{ @@ -11,6 +11,7 @@ use stackable_operator::{ product_image_selection::ResolvedProductImage, resources::{NoRuntimeLimits, Resources}, }, + constant, crd::{git_sync, listener}, k8s_openapi::{ api::{ @@ -22,11 +23,9 @@ use stackable_operator::{ apimachinery::pkg::apis::meta::v1::ObjectMeta, }, kube::Resource, - kvp::Labels, shared::time::Duration, v2::{ HasName, HasUid, NameIsValidLabelValue, - kvp::label::{recommended_labels, role_group_selector}, product_logging::framework::{ValidatedContainerLogConfigChoice, VectorContainerLogConfig}, role_group_utils::ResourceNames, role_utils::{self, JavaCommonConfig, RoleGroupConfig}, @@ -34,14 +33,14 @@ use stackable_operator::{ kubernetes::{ListenerClassName, NamespaceName, SecretClassName, SecretName, Uid}, operator::{ ClusterName, ControllerName, OperatorName, ProductName, ProductVersion, - RoleGroupName, RoleName, + RoleGroupName, }, }, }, }; use crate::{ - OPERATOR_NAME, + NIFI_OPERATOR_NAME, controller::dereference::ExistingSecrets, crd::{ APP_NAME, HostHeaderCheckConfig, NifiConfig, NifiRole, NifiStorageConfig, @@ -59,14 +58,9 @@ pub(crate) mod dereference; pub(crate) mod update_status; pub(crate) mod validate; -// Placeholder version label value for resources whose labels must not change after deployment. -stackable_operator::constant!(UNVERSIONED_PRODUCT_VERSION: ProductVersion = "none"); - -// Placeholder role and role-group label values for resources that are shared by the whole cluster -// and therefore not tied to a role or role group (see -// [`ValidatedCluster::cluster_shared_recommended_labels`]). -stackable_operator::constant!(NONE_ROLE_NAME: RoleName = "none"); -stackable_operator::constant!(NONE_ROLE_GROUP_NAME: RoleGroupName = "none"); +constant!(PRODUCT_NAME: ProductName = APP_NAME); +constant!(OPERATOR_NAME: OperatorName = NIFI_OPERATOR_NAME); +constant!(CONTROLLER_NAME: ControllerName = NIFI_CONTROLLER_NAME); /// Marker for prepared Kubernetes resources which are not applied yet. pub struct Prepared; @@ -88,7 +82,7 @@ pub struct KubernetesResources { pub config_maps: Vec, /// The Secrets whose contents this operator generates: the sensitive-properties key and, for /// OIDC authentication, the admin password. See - /// [`build::resource::secret`](crate::controller::build::resource::secret). + /// [`build::resource::secret`]. pub secrets: Vec, pub pod_disruption_budgets: Vec, pub service_accounts: Vec, @@ -300,7 +294,7 @@ impl ValidatedCluster { pub fn cluster_resource_names(&self) -> role_utils::ResourceNames { role_utils::ResourceNames { cluster_name: self.name.clone(), - product_name: product_name(), + product_name: PRODUCT_NAME.clone(), } } @@ -311,84 +305,10 @@ impl ValidatedCluster { ) -> ResourceNames { ResourceNames { cluster_name: self.name.clone(), - role_name: NifiRole::Node.into(), + role_name: NifiRole::Node.deref().clone(), role_group_name: role_group_name.clone(), } } - - /// Recommended labels for a role-group resource. - pub fn recommended_labels(&self, role_group_name: &RoleGroupName) -> Labels { - self.recommended_labels_for(&NifiRole::Node.into(), role_group_name) - } - - /// Recommended labels for a resource that is not tied to a concrete role, using a free-form role/role-group label value. - pub fn recommended_labels_for( - &self, - role_name: &RoleName, - role_group_name: &RoleGroupName, - ) -> Labels { - self.recommended_labels_with(&self.product_version, role_name, role_group_name) - } - - /// Recommended labels for a resource that is shared by the whole cluster rather than tied to a - /// role or role group (the RBAC pair, the Secrets built by this operator), which is expressed - /// by carrying `none` for both label values. - pub fn cluster_shared_recommended_labels(&self) -> Labels { - self.recommended_labels_for(&NONE_ROLE_NAME, &NONE_ROLE_GROUP_NAME) - } - - /// Recommended labels with the constant [`UNVERSIONED_PRODUCT_VERSION`], for PVC templates - /// that cannot be modified after deployment (keeps the labels stable across version upgrades). - pub fn unversioned_recommended_labels(&self, role_group_name: &RoleGroupName) -> Labels { - self.recommended_labels_with( - &UNVERSIONED_PRODUCT_VERSION, - &NifiRole::Node.into(), - role_group_name, - ) - } - - fn recommended_labels_with( - &self, - product_version: &ProductVersion, - role_name: &RoleName, - role_group_name: &RoleGroupName, - ) -> Labels { - recommended_labels( - self, - &product_name(), - product_version, - &operator_name(), - &controller_name(), - role_name, - role_group_name, - ) - } - - /// Selector labels matching the pods of a role group. - pub fn role_group_selector(&self, role_group_name: &RoleGroupName) -> Labels { - role_group_selector( - self, - &product_name(), - &NifiRole::Node.into(), - role_group_name, - ) - } -} - -/// The product name (`nifi`) as a type-safe label value. -pub(crate) fn product_name() -> ProductName { - ProductName::from_str(APP_NAME).expect("'nifi' is a valid product name") -} - -/// The operator name as a type-safe label value. -pub(crate) fn operator_name() -> OperatorName { - OperatorName::from_str(OPERATOR_NAME).expect("the operator name is a valid label value") -} - -/// The controller name as a type-safe label value. -pub(crate) fn controller_name() -> ControllerName { - ControllerName::from_str(NIFI_CONTROLLER_NAME) - .expect("the controller name is a valid label value") } impl NameIsValidLabelValue for ValidatedCluster { @@ -440,18 +360,13 @@ impl Resource for ValidatedCluster { #[cfg(test)] mod tests { - use stackable_operator::v2::types::operator::RoleName; - use strum::IntoEnumIterator; - - use crate::crd::NifiRole; + use super::{CONTROLLER_NAME, OPERATOR_NAME, PRODUCT_NAME}; - /// Locks the invariant behind the `expect` in the `From for RoleName` impls: - /// every `NifiRole` variant (present and future) must serialise to a valid `RoleName`. #[test] - fn every_nifi_role_serialises_to_a_valid_role_name() { - for role in NifiRole::iter() { - let _: RoleName = (&role).into(); - let _: RoleName = role.into(); - } + fn test_constants() { + // Test that dereferencing the constants does not panic. + let _ = *PRODUCT_NAME; + let _ = *OPERATOR_NAME; + let _ = *CONTROLLER_NAME; } } diff --git a/rust/operator-binary/src/controller/update_status.rs b/rust/operator-binary/src/controller/update_status.rs index 01243da3..9d33170d 100644 --- a/rust/operator-binary/src/controller/update_status.rs +++ b/rust/operator-binary/src/controller/update_status.rs @@ -11,7 +11,7 @@ use stackable_operator::{ use strum::{EnumDiscriminants, IntoStaticStr}; use crate::{ - OPERATOR_NAME, + NIFI_OPERATOR_NAME, controller::{Applied, KubernetesResources, ValidatedCluster}, crd::{NifiStatus, v1alpha1}, }; @@ -53,7 +53,7 @@ pub async fn update_status( }; client - .apply_patch_status(OPERATOR_NAME, nifi, &status) + .apply_patch_status(NIFI_OPERATOR_NAME, nifi, &status) .await .context(ApplyStatusSnafu)?; diff --git a/rust/operator-binary/src/controller/validate.rs b/rust/operator-binary/src/controller/validate.rs index 6fe4993a..692eb598 100644 --- a/rust/operator-binary/src/controller/validate.rs +++ b/rust/operator-binary/src/controller/validate.rs @@ -13,14 +13,13 @@ use stackable_operator::{ k8s_openapi::api::core::v1::Secret, kube::{ResourceExt as _, runtime::reflector::ObjectRef}, product_logging::spec::Logging, - role_utils::CommonConfiguration, v2::{ - builder::pod::container::{EnvVarName, EnvVarSet}, + builder::pod::container::EnvVarSet, controller_utils::{self, get_cluster_name, get_uid}, product_logging::framework::{ VectorContainerLogConfig, validate_logging_configuration_for_container, }, - role_utils::with_validated_config, + role_utils::{CommonConfiguration, with_validated_config}, types::{ kubernetes::{ConfigMapName, NamespaceName}, operator::{ProductVersion, RoleGroupName}, @@ -77,12 +76,6 @@ pub enum Error { role_group: String, }, - #[snafu(display("environment variable name {name:?} is invalid"))] - ParseEnvVarName { - source: stackable_operator::v2::macros::attributed_string_type::Error, - name: String, - }, - #[snafu(display("failed to build git-sync resources"))] BuildGitSyncResources { source: crate::controller::build::git_sync::Error, @@ -325,16 +318,9 @@ pub(crate) fn build_role_group_configs( product_specific_common_config, } = validated.config; - // Convert the merged env-override HashMap into an EnvVarSet, validating each name - // eagerly. Keys are unique (HashMap), so insertion order is irrelevant. - let mut env_overrides_set = EnvVarSet::new(); - for (name, value) in env_overrides { - env_overrides_set = env_overrides_set.with_value( - &EnvVarName::from_str(&name) - .context(ParseEnvVarNameSnafu { name: name.clone() })?, - value, - ); - } + // The env override names are validated on deserialization by the shared `EnvVarName` + // type; only the conversion into an `EnvVarSet` remains. + let env_overrides_set: EnvVarSet = env_overrides.into(); // Validate the logging config (NiFi + optional Vector container) up-front so an invalid // custom log ConfigMap name, or a missing Vector aggregator discovery ConfigMap name, fails diff --git a/rust/operator-binary/src/crd/mod.rs b/rust/operator-binary/src/crd/mod.rs index e573d8a8..30c413c0 100644 --- a/rust/operator-binary/src/crd/mod.rs +++ b/rust/operator-binary/src/crd/mod.rs @@ -4,7 +4,7 @@ pub mod sensitive_properties; pub mod storage; pub mod tls; -use std::str::FromStr; +use std::{ops::Deref, str::FromStr}; use affinity::get_affinity; use authorization::NifiAuthorization; @@ -21,19 +21,20 @@ use stackable_operator::{ }, }, config::{fragment::Fragment, merge::Merge}, + constant, crd::{authentication::core as auth_core, git_sync}, deep_merger::ObjectOverrides, k8s_openapi::{api::core::v1::Volume, apimachinery::pkg::api::resource::Quantity}, kube::CustomResource, product_logging::{self, spec::Logging}, - role_utils::{GenericRoleConfig, Role}, + role_utils::GenericRoleConfig, schemars::{self, JsonSchema}, shared::time::Duration, status::condition::{ClusterCondition, HasStatusCondition}, utils::crds::raw_object_list_schema, v2::{ config_overrides::KeyValueConfigOverrides, - role_utils::JavaCommonConfig, + role_utils::{JavaCommonConfig, Role}, types::{ kubernetes::{ConfigMapName, ListenerClassName, SecretClassName}, operator::{ProductVersion, RoleName}, @@ -222,35 +223,20 @@ pub fn default_allow_all() -> bool { true } -#[derive( - Clone, - Debug, - Deserialize, - Eq, - JsonSchema, - Ord, - PartialEq, - PartialOrd, - Serialize, - strum::Display, - strum::EnumIter, -)] -#[serde(rename_all = "camelCase")] -#[strum(serialize_all = "camelCase")] +constant!(NODE_ROLE_NAME: RoleName = "node"); + +#[derive(Clone, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)] pub enum NifiRole { - #[strum(serialize = "node")] Node, } -impl From for RoleName { - fn from(value: NifiRole) -> Self { - RoleName::from_str(&value.to_string()).expect("a NifiRole is a valid role name") - } -} +impl Deref for NifiRole { + type Target = RoleName; -impl From<&NifiRole> for RoleName { - fn from(value: &NifiRole) -> Self { - RoleName::from_str(&value.to_string()).expect("a NifiRole is a valid role name") + fn deref(&self) -> &Self::Target { + match self { + NifiRole::Node => &NODE_ROLE_NAME, + } } } @@ -555,7 +541,14 @@ mod merge_tests { mod tests { use stackable_operator::versioned::test_utils::RoundtripTestData; - use super::v1alpha1; + use super::*; + use crate::crd::v1alpha1; + + #[test] + fn test_constants() { + // Test that dereferencing the constants does not panic. + let _ = *NODE_ROLE_NAME; + } impl RoundtripTestData for v1alpha1::NifiClusterSpec { fn roundtrip_test_data() -> Vec { diff --git a/rust/operator-binary/src/main.rs b/rust/operator-binary/src/main.rs index 8b3c1b4c..fb8f637f 100644 --- a/rust/operator-binary/src/main.rs +++ b/rust/operator-binary/src/main.rs @@ -48,7 +48,7 @@ mod built_info { include!(concat!(env!("OUT_DIR"), "/built.rs")); } -const OPERATOR_NAME: &str = "nifi.stackable.tech"; +const NIFI_OPERATOR_NAME: &str = "nifi.stackable.tech"; const FIELD_MANAGER: &str = "nifi-operator"; #[derive(Parser)] @@ -97,7 +97,7 @@ async fn main() -> anyhow::Result<()> { .map(anyhow::Ok); let client = stackable_operator::client::initialize_operator( - Some(OPERATOR_NAME.to_string()), + Some(NIFI_OPERATOR_NAME.to_string()), &common.cluster_info, ) .await?; diff --git a/rust/operator-binary/src/nifi_controller.rs b/rust/operator-binary/src/nifi_controller.rs index 34235c12..3ded94cd 100644 --- a/rust/operator-binary/src/nifi_controller.rs +++ b/rust/operator-binary/src/nifi_controller.rs @@ -23,7 +23,7 @@ use stackable_operator::{ use strum::{EnumDiscriminants, IntoStaticStr}; use crate::{ - OPERATOR_NAME, + NIFI_OPERATOR_NAME, controller::{ apply::{self, Applier}, build, dereference, @@ -34,7 +34,8 @@ use crate::{ }; pub const NIFI_CONTROLLER_NAME: &str = "nificluster"; -pub const NIFI_FULL_CONTROLLER_NAME: &str = concatcp!(NIFI_CONTROLLER_NAME, '.', OPERATOR_NAME); +pub const NIFI_FULL_CONTROLLER_NAME: &str = + concatcp!(NIFI_CONTROLLER_NAME, '.', NIFI_OPERATOR_NAME); pub struct Ctx { pub client: Client, diff --git a/rust/operator-binary/src/security/authorization.rs b/rust/operator-binary/src/security/authorization.rs index 4789a95a..185a1ec1 100644 --- a/rust/operator-binary/src/security/authorization.rs +++ b/rust/operator-binary/src/security/authorization.rs @@ -9,7 +9,10 @@ use stackable_operator::{ k8s_openapi::api::core::v1::{ ConfigMap, ConfigMapKeySelector, EnvVar, EnvVarSource, Volume, VolumeMount, }, - v2::types::kubernetes::VolumeName, + v2::{ + builder::pod::container::{EnvVarName, EnvVarSet}, + types::kubernetes::VolumeName, + }, }; use crate::crd::{ @@ -18,6 +21,9 @@ use crate::crd::{ }; stackable_operator::constant!(OPA_TLS_VOLUME_NAME: VolumeName = "opa-tls"); +// The env var carrying the OPA base URL (mounted from the OPA discovery ConfigMap) and referenced +// as `${env:OPA_BASE_URL}` in the generated authorizers.xml. +stackable_operator::constant!(OPA_BASE_URL_ENV: EnvVarName = "OPA_BASE_URL"); pub const OPA_TLS_MOUNT_PATH: &str = "/stackable/opa_tls"; const FILE_BASED_MOUNT_DIRECTORY: &str = "filebased"; @@ -204,16 +210,16 @@ impl ResolvedNifiAuthorizationConfig { authorizers_xml } - pub fn get_env_vars(&self) -> Vec { + pub fn get_env_vars(&self) -> EnvVarSet { match self { ResolvedNifiAuthorizationConfig::Opa { config: OpaConfig { config_map_name, .. }, .. - } => { - vec![EnvVar { - name: "OPA_BASE_URL".to_owned(), + } => EnvVarSet::new() + .with_env_var(EnvVar { + name: OPA_BASE_URL_ENV.to_string(), value_from: Some(EnvVarSource { config_map_key_ref: Some(ConfigMapKeySelector { key: "OPA".to_owned(), @@ -223,10 +229,10 @@ impl ResolvedNifiAuthorizationConfig { ..Default::default() }), ..Default::default() - }] - } - ResolvedNifiAuthorizationConfig::SingleUser => vec![], - ResolvedNifiAuthorizationConfig::Standard { .. } => vec![], + }) + .expect("the name comes from a typed EnvVarName constant and is therefore valid"), + ResolvedNifiAuthorizationConfig::SingleUser => EnvVarSet::new(), + ResolvedNifiAuthorizationConfig::Standard { .. } => EnvVarSet::new(), } } @@ -308,6 +314,13 @@ impl ResolvedNifiAuthorizationConfig { mod tests { use std::collections::BTreeMap; + #[test] + fn test_constants() { + // Test that dereferencing the constants does not panic. + let _ = *OPA_TLS_VOLUME_NAME; + let _ = *OPA_BASE_URL_ENV; + } + use super::*; fn opa_authorization() -> NifiAuthorization { diff --git a/rust/operator-binary/src/security/tls.rs b/rust/operator-binary/src/security/tls.rs index d66aa640..bc1c824b 100644 --- a/rust/operator-binary/src/security/tls.rs +++ b/rust/operator-binary/src/security/tls.rs @@ -61,3 +61,15 @@ pub(crate) fn build_tls_volume( ) .build()) } + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn test_constants() { + // Test that dereferencing the constants does not panic. + let _ = *KEYSTORE_VOLUME_NAME; + let _ = *TRUSTSTORE_VOLUME_NAME; + } +} diff --git a/tests/templates/kuttl/smoke/34-assert.yaml.j2 b/tests/templates/kuttl/smoke/34-assert.yaml.j2 index c7fa1be4..73024c90 100644 --- a/tests/templates/kuttl/smoke/34-assert.yaml.j2 +++ b/tests/templates/kuttl/smoke/34-assert.yaml.j2 @@ -200,7 +200,6 @@ metadata: app.kubernetes.io/instance: nifi-node app.kubernetes.io/managed-by: listeners.stackable.tech_listener app.kubernetes.io/name: listener - app.kubernetes.io/role-group: none stackable.tech/vendor: Stackable ownerReferences: - apiVersion: listeners.stackable.tech/v1alpha1 @@ -289,7 +288,6 @@ metadata: app.kubernetes.io/instance: nifi app.kubernetes.io/managed-by: nifi.stackable.tech_nificluster app.kubernetes.io/name: nifi - app.kubernetes.io/role-group: none stackable.tech/vendor: Stackable ownerReferences: - apiVersion: nifi.stackable.tech/v1alpha1 From ec0d0947db38f7302453b9ac3900e255a0f6be66 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Wed, 19 Aug 2026 12:27:50 +0200 Subject: [PATCH 2/3] changelog --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e77e89f5..bcde6e95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,16 @@ All notable changes to this project will be documented in this file. - All product containers now run with `securityContext.runAsNonRoot` set to `true` to improve security ([#975]). - NiFi startup and readiness probes now use the local management server's `/health` and `/health/cluster` endpoints instead of a bare TCP check ([#976], [#982]). +- Environment variable overrides (`envOverrides`) are now merged into the operator-set + environment variables by name, so an override replaces the operator's value instead of + producing a duplicated entry whose precedence depended on Kubernetes' duplicate-name + handling ([#984]). +- BREAKING: Remove the `app.kubernetes.io/component` and `app.kubernetes.io/role-group` labels + from the resources they don't apply to, and the `app.kubernetes.io/version` label from PVC + templates (all previously set to the placeholder value `none`). Because the PVC templates of + a StatefulSet are immutable, StatefulSets created by older operator versions cannot be + updated in place: after the operator upgrade, delete each node StatefulSet so that the + operator immediately recreates it with the new labels ([#984]). ### Fixed @@ -37,6 +47,7 @@ All notable changes to this project will be documented in this file. [#975]: https://github.com/stackabletech/nifi-operator/pull/975 [#976]: https://github.com/stackabletech/nifi-operator/pull/976 [#982]: https://github.com/stackabletech/nifi-operator/pull/982 +[#984]: https://github.com/stackabletech/nifi-operator/pull/984 ## [26.7.0] - 2026-07-21 From a79f5d360fc7677cee6d62d4d19911b640c1e948 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Wed, 19 Aug 2026 12:41:47 +0200 Subject: [PATCH 3/3] corrected imports --- .../src/controller/build/resource/listener.rs | 3 +- .../controller/build/resource/statefulset.rs | 37 ++++++++++--------- .../src/security/authorization.rs | 5 ++- rust/operator-binary/src/security/tls.rs | 5 ++- 4 files changed, 27 insertions(+), 23 deletions(-) diff --git a/rust/operator-binary/src/controller/build/resource/listener.rs b/rust/operator-binary/src/controller/build/resource/listener.rs index cd3de3de..9c6b521d 100644 --- a/rust/operator-binary/src/controller/build/resource/listener.rs +++ b/rust/operator-binary/src/controller/build/resource/listener.rs @@ -1,6 +1,7 @@ use std::str::FromStr; use stackable_operator::{ + constant, crd::listener::v1alpha1::{Listener, ListenerPort, ListenerSpec}, k8s_openapi::api::core::v1::PersistentVolumeClaim, kvp::Labels, @@ -27,7 +28,7 @@ pub const LISTENER_VOLUME_NAME: &str = "listener"; pub const LISTENER_VOLUME_DIR: &str = "/stackable/listener"; // The listener volume is provisioned as a PVC by the listener-operator; this is its typed name. -stackable_operator::constant!(LISTENER_PVC_NAME: PersistentVolumeClaimName = "listener"); +constant!(LISTENER_PVC_NAME: PersistentVolumeClaimName = "listener"); pub fn build_group_listener( cluster: &ValidatedCluster, diff --git a/rust/operator-binary/src/controller/build/resource/statefulset.rs b/rust/operator-binary/src/controller/build/resource/statefulset.rs index af5d7f1d..d00a2d28 100644 --- a/rust/operator-binary/src/controller/build/resource/statefulset.rs +++ b/rust/operator-binary/src/controller/build/resource/statefulset.rs @@ -13,6 +13,7 @@ use stackable_operator::{ security::PodSecurityContextBuilder, volume::SecretFormat, }, }, + constant, constants::RESTART_CONTROLLER_ENABLED_LABEL, crd::authentication::oidc::v1alpha1::AuthenticationProvider, k8s_openapi::{ @@ -124,58 +125,58 @@ const USERDATA_MOUNTPOINT: &str = "/stackable/userdata"; // Volume providing the rendered NiFi config (the `conf` ConfigMap), mounted into the prepare // container which templates it into `ACTIVE_CONFIG_VOLUME_NAME`. -stackable_operator::constant!(CONFIG_VOLUME_NAME: VolumeName = "conf"); +constant!(CONFIG_VOLUME_NAME: VolumeName = "conf"); const CONFIG_VOLUME_MOUNT: &str = "/conf"; // `emptyDir` holding the live config templated by the prepare container and shared with the NiFi // container. -stackable_operator::constant!(ACTIVE_CONFIG_VOLUME_NAME: VolumeName = "activeconf"); +constant!(ACTIVE_CONFIG_VOLUME_NAME: VolumeName = "activeconf"); // Volume holding the generated sensitive-properties key. -stackable_operator::constant!(SENSITIVE_PROPERTY_VOLUME_NAME: VolumeName = "sensitiveproperty"); +constant!(SENSITIVE_PROPERTY_VOLUME_NAME: VolumeName = "sensitiveproperty"); // Volume providing the log config (logback/log4j) ConfigMap. -stackable_operator::constant!(LOG_CONFIG_VOLUME_NAME: VolumeName = "log-config"); +constant!(LOG_CONFIG_VOLUME_NAME: VolumeName = "log-config"); /// Directory the `log-config` ConfigMap volume is mounted at. const STACKABLE_LOG_CONFIG_DIR: &str = "/stackable/log_config"; // Volume the NiFi logs are written to and shared with the Vector sidecar (also used by the // git-sync container, see [`crate::controller::build::git_sync`]). -stackable_operator::constant!(pub(crate) LOG_VOLUME_NAME: VolumeName = "log"); +constant!(pub(crate) LOG_VOLUME_NAME: VolumeName = "log"); // `emptyDir` for the Python working directory, mounted into the NiFi container at // `NIFI_PYTHON_WORKING_DIRECTORY`. -stackable_operator::constant!(PYTHON_WORKING_DIR_VOLUME_NAME: VolumeName = "nifi-python-working-directory"); +constant!(PYTHON_WORKING_DIR_VOLUME_NAME: VolumeName = "nifi-python-working-directory"); // Container names. These must match the corresponding (kebab-cased) `crate::crd::Container` // variants, which key the per-container logging config. -stackable_operator::constant!(PREPARE_CONTAINER_NAME: ContainerName = "prepare"); -stackable_operator::constant!(NIFI_CONTAINER_NAME: ContainerName = "nifi"); -stackable_operator::constant!(VECTOR_CONTAINER_NAME: ContainerName = "vector"); +constant!(PREPARE_CONTAINER_NAME: ContainerName = "prepare"); +constant!(NIFI_CONTAINER_NAME: ContainerName = "nifi"); +constant!(VECTOR_CONTAINER_NAME: ContainerName = "vector"); // Typed `VolumeName`s for the Vector container's log-config and log volumes. They reuse the // existing rolegroup-`ConfigMap` "config" volume (which carries `vector.yaml`) and the "log" // empty-dir, both already added to the pod by `build_node_rolegroup_statefulset`. -stackable_operator::constant!(VECTOR_LOG_CONFIG_VOLUME_NAME: VolumeName = "config"); -stackable_operator::constant!(VECTOR_LOG_VOLUME_NAME: VolumeName = "log"); +constant!(VECTOR_LOG_CONFIG_VOLUME_NAME: VolumeName = "config"); +constant!(VECTOR_LOG_VOLUME_NAME: VolumeName = "log"); // Names of the environment variables injected into the NiFi container here and referenced as // `${env:...}` placeholders by the config-file builders (`nifi.properties`, // `state-management.xml`). The two sides must agree. -stackable_operator::constant!(pub(crate) STACKLET_NAME_ENV: EnvVarName = "STACKLET_NAME"); -stackable_operator::constant!(pub(crate) ZOOKEEPER_HOSTS_ENV: EnvVarName = "ZOOKEEPER_HOSTS"); -stackable_operator::constant!(pub(crate) ZOOKEEPER_CHROOT_ENV: EnvVarName = "ZOOKEEPER_CHROOT"); +constant!(pub(crate) STACKLET_NAME_ENV: EnvVarName = "STACKLET_NAME"); +constant!(pub(crate) ZOOKEEPER_HOSTS_ENV: EnvVarName = "ZOOKEEPER_HOSTS"); +constant!(pub(crate) ZOOKEEPER_CHROOT_ENV: EnvVarName = "ZOOKEEPER_CHROOT"); // The ZooKeeper env var names double as the keys of the ZooKeeper discovery ConfigMap the // values are mounted from (the same strings, as the env var names are used as the keys). -stackable_operator::constant!(ZOOKEEPER_HOSTS_CONFIG_MAP_KEY: ConfigMapKey = "ZOOKEEPER_HOSTS"); -stackable_operator::constant!(ZOOKEEPER_CHROOT_CONFIG_MAP_KEY: ConfigMapKey = "ZOOKEEPER_CHROOT"); +constant!(ZOOKEEPER_HOSTS_CONFIG_MAP_KEY: ConfigMapKey = "ZOOKEEPER_HOSTS"); +constant!(ZOOKEEPER_CHROOT_CONFIG_MAP_KEY: ConfigMapKey = "ZOOKEEPER_CHROOT"); // The POD_NAME env var is needed to overwrite `nifi.cluster.node.address` later. -stackable_operator::constant!(POD_NAME_ENV: EnvVarName = "POD_NAME"); +constant!(POD_NAME_ENV: EnvVarName = "POD_NAME"); // Needed for the `containerdebug` process to log its tracing information to. -stackable_operator::constant!(CONTAINERDEBUG_LOG_DIRECTORY_ENV: EnvVarName = "CONTAINERDEBUG_LOG_DIRECTORY"); +constant!(CONTAINERDEBUG_LOG_DIRECTORY_ENV: EnvVarName = "CONTAINERDEBUG_LOG_DIRECTORY"); // Names of environment variables exported by shell commands in the containers (never set as // Kubernetes `EnvVar`s by the operator) and referenced as `${env:...}` placeholders by the diff --git a/rust/operator-binary/src/security/authorization.rs b/rust/operator-binary/src/security/authorization.rs index 185a1ec1..a182806f 100644 --- a/rust/operator-binary/src/security/authorization.rs +++ b/rust/operator-binary/src/security/authorization.rs @@ -6,6 +6,7 @@ use stackable_operator::{ builder::pod::volume::{SecretOperatorVolumeSourceBuilder, VolumeBuilder}, client::Client, commons::{opa::OpaConfig, secret_class::SecretClassVolumeProvisionParts}, + constant, k8s_openapi::api::core::v1::{ ConfigMap, ConfigMapKeySelector, EnvVar, EnvVarSource, Volume, VolumeMount, }, @@ -20,10 +21,10 @@ use crate::crd::{ storage::{NIFI_PVC_STORAGE_DIRECTORY, NifiRepository}, }; -stackable_operator::constant!(OPA_TLS_VOLUME_NAME: VolumeName = "opa-tls"); +constant!(OPA_TLS_VOLUME_NAME: VolumeName = "opa-tls"); // The env var carrying the OPA base URL (mounted from the OPA discovery ConfigMap) and referenced // as `${env:OPA_BASE_URL}` in the generated authorizers.xml. -stackable_operator::constant!(OPA_BASE_URL_ENV: EnvVarName = "OPA_BASE_URL"); +constant!(OPA_BASE_URL_ENV: EnvVarName = "OPA_BASE_URL"); pub const OPA_TLS_MOUNT_PATH: &str = "/stackable/opa_tls"; const FILE_BASED_MOUNT_DIRECTORY: &str = "filebased"; diff --git a/rust/operator-binary/src/security/tls.rs b/rust/operator-binary/src/security/tls.rs index bc1c824b..8a0d554e 100644 --- a/rust/operator-binary/src/security/tls.rs +++ b/rust/operator-binary/src/security/tls.rs @@ -4,6 +4,7 @@ use snafu::{ResultExt, Snafu}; use stackable_operator::{ builder::pod::volume::{SecretFormat, SecretOperatorVolumeSourceBuilder, VolumeBuilder}, commons::secret_class::SecretClassVolumeProvisionParts, + constant, k8s_openapi::api::core::v1::Volume, shared::time::Duration, v2::types::kubernetes::{SecretClassName, VolumeName}, @@ -11,9 +12,9 @@ use stackable_operator::{ use crate::security::authentication::STACKABLE_TLS_STORE_PASSWORD; -stackable_operator::constant!(pub KEYSTORE_VOLUME_NAME: VolumeName = "keystore"); +constant!(pub KEYSTORE_VOLUME_NAME: VolumeName = "keystore"); pub const KEYSTORE_NIFI_CONTAINER_MOUNT: &str = "/stackable/keystore"; -stackable_operator::constant!(pub TRUSTSTORE_VOLUME_NAME: VolumeName = "truststore"); +constant!(pub TRUSTSTORE_VOLUME_NAME: VolumeName = "truststore"); type Result = std::result::Result;