From e8badb74c5e649ab30d2b577298ffad4a16c22e1 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Tue, 18 Aug 2026 17:37:48 +0200 Subject: [PATCH 1/4] update to op-rs 0.116, use constants! and test derefs, use framework labels functions --- CHANGELOG.md | 12 +- Cargo.lock | 233 ++++++------ Cargo.nix | 285 ++++++++------- Cargo.toml | 2 +- crate-hashes.json | 18 +- deploy/helm/chart_testing.yaml | 1 + extra/crds.yaml | 12 +- rust/operator-binary/src/controller.rs | 107 ++---- rust/operator-binary/src/controller/apply.rs | 10 +- .../src/controller/build/command.rs | 22 +- .../src/controller/build/kerberos.rs | 43 ++- .../src/controller/build/mod.rs | 68 +++- .../controller/build/resource/config_map.rs | 7 +- .../controller/build/resource/discovery.rs | 15 +- .../src/controller/build/resource/listener.rs | 13 +- .../src/controller/build/resource/pdb.rs | 10 +- .../src/controller/build/resource/rbac.rs | 30 +- .../src/controller/build/resource/service.rs | 30 +- .../controller/build/resource/statefulset.rs | 333 +++++++++++++----- .../src/controller/node_id_hasher.rs | 2 +- .../src/controller/update_status.rs | 4 +- .../src/controller/validate.rs | 59 ++-- rust/operator-binary/src/crd/mod.rs | 18 +- rust/operator-binary/src/crd/role/mod.rs | 58 ++- rust/operator-binary/src/main.rs | 10 +- .../kuttl/smoke-kraft/33-assert.yaml.j2 | 1 - tests/templates/kuttl/smoke/34-assert.yaml.j2 | 1 - 27 files changed, 814 insertions(+), 590 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e3b1a1a9..3d38049c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ All notable changes to this project will be documented in this file. - Internal operator refactoring: introduce a build() step in the reconciler that assembles all relevant Kubernetes resources before anything is applied ([#985]). -- Bump stackable-operator to 0.114.0 ([#994]). +- Bump stackable-operator to 0.116.0 ([#994], [#1011]). - The RBAC ServiceAccount and RoleBinding are now built with the operator-rs `v2::rbac` functions and carry the full set of recommended labels ([#990]). - BREAKING: The `brokers` role is now required by the CRD; a KafkaCluster without it was @@ -16,6 +16,15 @@ 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 ([#998]). - The reconciler now applies resources and derives the cluster status in discrete apply and update_status steps ([#1000]). +- 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 ([#XXX]). +- BREAKING: Remove the `app.kubernetes.io/component` and `app.kubernetes.io/role-group` labels + from the resources they don't apply to (previously set to `none` or a placeholder value). + Broker StatefulSets created by older operator versions cannot be updated in place: after the + operator upgrade, delete each broker StatefulSet so that the operator immediately recreates it + with the new labels ([#XXX]). ### Fixed @@ -28,6 +37,7 @@ All notable changes to this project will be documented in this file. [#994]: https://github.com/stackabletech/kafka-operator/pull/994 [#998]: https://github.com/stackabletech/kafka-operator/pull/998 [#1000]: https://github.com/stackabletech/kafka-operator/pull/1000 +[#XXX]: https://github.com/stackabletech/kafka-operator/pull/XXX ## [26.7.0] - 2026-07-21 diff --git a/Cargo.lock b/Cargo.lock index 94995fbfe..48918fa36 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]] @@ -910,9 +910,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" @@ -953,9 +953,9 @@ dependencies = [ [[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", @@ -968,9 +968,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", @@ -978,15 +978,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", @@ -995,32 +995,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" @@ -1030,9 +1030,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-channel", "futures-core", @@ -1146,9 +1146,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", @@ -1228,9 +1228,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", @@ -1358,9 +1358,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", @@ -1372,9 +1372,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", @@ -1385,9 +1385,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", @@ -1399,16 +1399,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", @@ -1419,15 +1420,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", @@ -1596,7 +1597,7 @@ dependencies = [ "jni-sys", "log", "simd_cesu8", - "thiserror 2.0.19", + "thiserror 2.0.20", "walkdir", "windows-link", ] @@ -1645,9 +1646,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", @@ -1664,7 +1665,7 @@ dependencies = [ "schemars", "serde", "serde_json", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -1677,7 +1678,7 @@ dependencies = [ "pest_derive", "regex", "serde_json", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -1706,7 +1707,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", @@ -1769,7 +1770,7 @@ dependencies = [ "serde", "serde-saphyr", "serde_json", - "thiserror 2.0.19", + "thiserror 2.0.20", "tokio", "tokio-util", "tower", @@ -1793,7 +1794,7 @@ dependencies = [ "serde", "serde-value", "serde_json", - "thiserror 2.0.19", + "thiserror 2.0.20", ] [[package]] @@ -1831,7 +1832,7 @@ dependencies = [ "pin-project", "serde", "serde_json", - "thiserror 2.0.19", + "thiserror 2.0.20", "tokio", "tokio-util", "tracing", @@ -1884,9 +1885,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" @@ -1990,9 +1991,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", ] @@ -2045,7 +2046,7 @@ dependencies = [ "futures-sink", "js-sys", "pin-project-lite", - "thiserror 2.0.19", + "thiserror 2.0.20", "tracing", ] @@ -2087,7 +2088,7 @@ dependencies = [ "opentelemetry_sdk", "prost", "reqwest", - "thiserror 2.0.19", + "thiserror 2.0.20", "tokio", "tonic", "tonic-types", @@ -2125,7 +2126,7 @@ dependencies = [ "percent-encoding", "portable-atomic", "rand 0.9.5", - "thiserror 2.0.19", + "thiserror 2.0.20", "tokio", "tokio-stream", ] @@ -2207,9 +2208,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", @@ -2217,9 +2218,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", @@ -2227,9 +2228,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", @@ -2240,9 +2241,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", ] @@ -2296,15 +2297,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" @@ -2317,9 +2318,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", ] @@ -2737,9 +2738,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", @@ -3147,7 +3148,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", @@ -3191,8 +3192,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", @@ -3236,7 +3237,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", @@ -3247,7 +3248,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", @@ -3264,7 +3265,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", @@ -3288,7 +3289,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", @@ -3302,7 +3303,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", @@ -3320,7 +3321,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", @@ -3452,11 +3453,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]] @@ -3472,9 +3473,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", @@ -3522,9 +3523,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", @@ -3783,7 +3784,7 @@ checksum = "050686193eb999b4bb3bc2acfa891a13da00f79734704c4b8b4ef1a10b368a3c" dependencies = [ "crossbeam-channel", "symlink", - "thiserror 2.0.19", + "thiserror 2.0.20", "time", "tracing-subscriber", ] @@ -3948,9 +3949,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", @@ -4010,9 +4011,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", @@ -4023,9 +4024,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", @@ -4033,9 +4034,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", @@ -4043,9 +4044,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", @@ -4056,18 +4057,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", @@ -4259,9 +4260,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" @@ -4369,9 +4370,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", @@ -4380,9 +4381,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", @@ -4391,13 +4392,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 9fd8db130..a78713ff4 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 = { @@ -2794,9 +2794,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"; }; @@ -2912,9 +2912,9 @@ rec { }; "futures" = rec { crateName = "futures"; - version = "0.3.33"; + version = "0.3.34"; edition = "2018"; - sha256 = "066j5aqz8an05xh4hn5ljdnjn80z3g335v4grx4gaifr57wg3358"; + sha256 = "18yhwmbdalhz2z9i1vm10hy2v0cfm82dkgcb6vr2msxazfix4ccs"; dependencies = [ { name = "futures-channel"; @@ -2974,9 +2974,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 = [ { @@ -3002,9 +3002,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" ]; @@ -3015,9 +3015,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 = [ { @@ -3045,9 +3045,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" ]; @@ -3056,9 +3056,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 = [ @@ -3072,7 +3072,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.119"; + packageId = "syn 3.0.3"; features = [ "full" ]; } ]; @@ -3080,9 +3080,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" ]; @@ -3092,9 +3092,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" ]; @@ -3119,9 +3119,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 = [ { @@ -3597,9 +3597,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 " @@ -3837,9 +3837,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 " @@ -4347,9 +4347,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" ]; @@ -4397,9 +4397,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" ]; @@ -4449,9 +4449,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" ]; @@ -4503,9 +4503,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" ]; @@ -4513,13 +4513,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"; @@ -4561,6 +4566,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" ]; }; @@ -4568,9 +4574,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" ]; @@ -4578,9 +4584,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" ]; @@ -5079,7 +5085,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 2.0.19"; + packageId = "thiserror 2.0.20"; } { name = "windows-link"; @@ -5197,9 +5203,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" @@ -5259,7 +5265,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 2.0.19"; + packageId = "thiserror 2.0.20"; } ]; devDependencies = [ @@ -5308,7 +5314,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 2.0.19"; + packageId = "thiserror 2.0.20"; } ]; @@ -5406,8 +5412,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 = [ @@ -5685,7 +5691,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 2.0.19"; + packageId = "thiserror 2.0.20"; } { name = "tokio"; @@ -5851,7 +5857,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 2.0.19"; + packageId = "thiserror 2.0.20"; } ]; devDependencies = [ @@ -6003,7 +6009,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 2.0.19"; + packageId = "thiserror 2.0.20"; } { name = "tokio"; @@ -6182,9 +6188,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" ]; @@ -6502,9 +6508,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" @@ -6646,7 +6652,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 2.0.19"; + packageId = "thiserror 2.0.20"; optional = true; usesDefaultFeatures = false; } @@ -6816,7 +6822,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 2.0.19"; + packageId = "thiserror 2.0.20"; usesDefaultFeatures = false; } { @@ -7023,7 +7029,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 2.0.19"; + packageId = "thiserror 2.0.20"; usesDefaultFeatures = false; } { @@ -7324,9 +7330,9 @@ rec { }; "pest" = rec { crateName = "pest"; - version = "2.8.8"; + version = "2.9.0"; edition = "2021"; - sha256 = "18jhl2zpxvl6kikc0jgp7gi7i7cy9s634z5bnvx70w1whjz2ixvx"; + sha256 = "1kwvhc5hyrfpxpmp0jw0wr891xyjs44mcs2wz68hrl54qw6ac1ss"; authors = [ "Dragoș Tiselice " ]; @@ -7353,9 +7359,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 " @@ -7381,9 +7387,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 " ]; @@ -7419,9 +7425,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 " ]; @@ -7552,9 +7558,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 " @@ -7563,9 +7569,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" ]; @@ -7596,9 +7602,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" ]; @@ -9066,9 +9072,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 = [ { @@ -9092,7 +9098,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" ]; @@ -10304,8 +10310,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 = [ @@ -10490,13 +10496,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 = [ @@ -10676,7 +10682,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" ]; @@ -10690,8 +10697,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"; @@ -10725,8 +10732,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 = [ @@ -10806,8 +10813,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 = [ @@ -10916,8 +10923,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 = [ @@ -10966,8 +10973,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"; @@ -11034,8 +11041,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 = [ @@ -11417,18 +11424,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 = { @@ -11462,11 +11469,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 = [ @@ -11615,9 +11622,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" ]; @@ -12698,7 +12705,7 @@ rec { } { name = "thiserror"; - packageId = "thiserror 2.0.19"; + packageId = "thiserror 2.0.20"; } { name = "time"; @@ -13233,9 +13240,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" @@ -13399,9 +13406,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" @@ -13450,9 +13457,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" @@ -13478,9 +13485,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 = [ @@ -13502,9 +13509,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" @@ -13538,10 +13545,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" @@ -13556,9 +13563,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" @@ -13814,6 +13821,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" ]; @@ -14936,9 +14947,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" ]; @@ -15248,9 +15259,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" ]; @@ -15288,9 +15299,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" ]; @@ -15334,9 +15345,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 = [ @@ -15353,7 +15364,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 01777f375..3f0b13944 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ edition = "2024" repository = "https://github.com/stackabletech/kafka-operator" [workspace.dependencies] -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.115.0", features = ["crds", "webhook"] } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.116.0", features = ["crds", "webhook"] } anyhow = "1.0" built = { version = "0.8", features = ["chrono", "git2"] } diff --git a/crate-hashes.json b/crate-hashes.json index 43cd4b729..3fae0f9f4 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/deploy/helm/chart_testing.yaml b/deploy/helm/chart_testing.yaml index 82b39c265..253af46d2 100644 --- a/deploy/helm/chart_testing.yaml +++ b/deploy/helm/chart_testing.yaml @@ -1,3 +1,4 @@ +--- remote: origin target-branch: main chart-dirs: diff --git a/extra/crds.yaml b/extra/crds.yaml index 498575fbe..d355b6cf3 100644 --- a/extra/crds.yaml +++ b/extra/crds.yaml @@ -481,7 +481,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 @@ -1016,7 +1017,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 @@ -1666,7 +1668,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 @@ -2107,7 +2110,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.rs b/rust/operator-binary/src/controller.rs index 2e3ca3a24..b8634e4fa 100644 --- a/rust/operator-binary/src/controller.rs +++ b/rust/operator-binary/src/controller.rs @@ -19,6 +19,7 @@ use stackable_operator::{ cli::OperatorEnvironmentOptions, cluster_resources::ClusterResourceApplyStrategy, commons::{networking::DomainName, product_image_selection::ResolvedProductImage}, + constant, crd::listener, k8s_openapi::api::{ apps::v1::StatefulSet, @@ -32,12 +33,10 @@ use stackable_operator::{ core::{DeserializeGuard, error_boundary}, runtime::{controller::Action, reflector::ObjectRef}, }, - kvp::Labels, logging::controller::ReconcilerError, shared::time::Duration, v2::{ HasName, HasUid, NameIsValidLabelValue, - kvp::label::{recommended_labels, role_group_selector}, role_group_utils::ResourceNames, role_utils, types::{ @@ -66,7 +65,7 @@ use crate::{ update_status::update_status, }, crd::{ - APP_NAME, KafkaPodDescriptor, MetadataManager, OPERATOR_NAME, + APP_NAME, KAFKA_OPERATOR_NAME, KafkaPodDescriptor, MetadataManager, authorization::KafkaAuthorizationConfig, role::{AnyConfig, AnyConfigOverrides, KafkaRole}, v1alpha1, @@ -74,15 +73,19 @@ use crate::{ }; pub const KAFKA_CONTROLLER_NAME: &str = "kafkacluster"; -pub const KAFKA_FULL_CONTROLLER_NAME: &str = concatcp!(KAFKA_CONTROLLER_NAME, '.', OPERATOR_NAME); +pub const KAFKA_FULL_CONTROLLER_NAME: &str = + concatcp!(KAFKA_CONTROLLER_NAME, '.', KAFKA_OPERATOR_NAME); -// Placeholder version label value for resources whose labels must not change after deployment. -stackable_operator::constant!(UNVERSIONED_PRODUCT_VERSION: ProductVersion = "none"); +constant!(PRODUCT_NAME: ProductName = APP_NAME); +constant!(OPERATOR_NAME: OperatorName = KAFKA_OPERATOR_NAME); +constant!(CONTROLLER_NAME: ControllerName = KAFKA_CONTROLLER_NAME); #[derive(Snafu, Debug)] pub enum PodDescriptorsError { #[snafu(display( - "the node id hash offset of role group {role}/{role_group} collides with {colliding_role}/{colliding_role_group}; node ids must be unique across the cluster" + "the node id hash offset of role group {role}/{role_group} collides with {colliding_role}/{colliding_role_group}; node ids must be unique across the cluster", + role = role.as_ref(), + colliding_role = colliding_role.as_ref(), ))] KafkaNodeIdHashCollision { role: KafkaRole, @@ -246,13 +249,12 @@ impl ValidatedCluster { Ok(pod_descriptors) } - /// The given [`KafkaRole`] as a type-safe [`RoleName`]. /// Type-safe names for the per-cluster RBAC resources: the ServiceAccount shared by all /// Pods, its (namespaced) RoleBinding, and the operator-deployed ClusterRole it binds. 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(), } } @@ -264,57 +266,11 @@ impl ValidatedCluster { ) -> ResourceNames { ResourceNames { cluster_name: self.name.clone(), - role_name: role.into(), + role_name: (**role).clone(), role_group_name: role_group_name.clone(), } } - /// Recommended labels for a role-group resource. - pub fn recommended_labels(&self, role: &KafkaRole, role_group_name: &RoleGroupName) -> Labels { - self.recommended_labels_for(&role.into(), role_group_name) - } - - /// Recommended labels for a resource that is not tied to a concrete [`KafkaRole`], 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 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: &KafkaRole, - role_group_name: &RoleGroupName, - ) -> Labels { - self.recommended_labels_with(&UNVERSIONED_PRODUCT_VERSION, &role.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: &KafkaRole, role_group_name: &RoleGroupName) -> Labels { - role_group_selector(self, &product_name(), &role.into(), role_group_name) - } - /// The name of the broker rolegroup's bootstrap [`Listener`](stackable_operator::crd::listener), /// `---bootstrap`. pub fn bootstrap_listener_name( @@ -344,22 +300,6 @@ impl NameIsValidLabelValue for ValidatedCluster { } } -/// The product name (`kafka`) as a type-safe label value. -pub(crate) fn product_name() -> ProductName { - ProductName::from_str(APP_NAME).expect("'kafka' 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(KAFKA_CONTROLLER_NAME) - .expect("the controller name is a valid label value") -} - /// Cluster-wide settings resolved during validation and dereferencing. /// /// Everything the build steps need is resolved here so they never have to read the @@ -685,15 +625,20 @@ pub(crate) mod test_support { mod tests { use std::collections::BTreeSet; - use stackable_operator::v2::types::operator::RoleName; - use strum::IntoEnumIterator; - use super::{ - PodDescriptorsError, + CONTROLLER_NAME, OPERATOR_NAME, PRODUCT_NAME, PodDescriptorsError, test_support::{minimal_kafka, validated_cluster}, }; use crate::crd::role::KafkaRole; + #[test] + fn test_constants() { + // Test that dereferencing the constants does not panic. + let _ = *PRODUCT_NAME; + let _ = *OPERATOR_NAME; + let _ = *CONTROLLER_NAME; + } + /// Two broker role groups whose names hash to the same node-id offset must be /// rejected: a collision would hand two pods the same Kafka `node.id`. `rg865` /// and `rg1400` are a known colliding pair for the `broker` role (see @@ -771,14 +716,4 @@ mod tests { let node_ids: BTreeSet = descriptors.iter().map(|d| d.node_id).collect(); assert_eq!(node_ids.len(), 3, "node ids must be unique: {node_ids:?}"); } - - /// Locks the invariant behind the `expect` in the `From for RoleName` impls: - /// every `KafkaRole` variant (present and future) must serialise to a valid `RoleName`. - #[test] - fn every_kafka_role_serialises_to_a_valid_role_name() { - for role in KafkaRole::iter() { - let _: RoleName = (&role).into(); - let _: RoleName = role.into(); - } - } } diff --git a/rust/operator-binary/src/controller/apply.rs b/rust/operator-binary/src/controller/apply.rs index 75e682cba..1ce080f87 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/command.rs b/rust/operator-binary/src/controller/build/command.rs index 4805a623b..34e303621 100644 --- a/rust/operator-binary/src/controller/build/command.rs +++ b/rust/operator-binary/src/controller/build/command.rs @@ -1,10 +1,13 @@ +use std::str::FromStr; + use indoc::formatdoc; use stackable_operator::{ + constant, product_logging::framework::{ create_vector_shutdown_file_command, remove_vector_shutdown_file_command, }, utils::COMMON_BASH_TRAP_FUNCTIONS, - v2::product_logging::framework::STACKABLE_LOG_DIR, + v2::{builder::pod::container::EnvVarName, product_logging::framework::STACKABLE_LOG_DIR}, }; use super::properties::ConfigFileName; @@ -32,10 +35,8 @@ pub fn kafka_log_opts(product_version: &str) -> String { } } -/// The env var carrying the Kafka log4j options (see [`kafka_log_opts`]). -pub fn kafka_log_opts_env_var() -> String { - "KAFKA_LOG4J_OPTS".to_string() -} +// The env var carrying the Kafka log4j options (see [`kafka_log_opts`]). +constant!(pub KAFKA_LOG4J_OPTS: EnvVarName = "KAFKA_LOG4J_OPTS"); /// Returns the commands to start the main Kafka container pub fn broker_kafka_container_commands( @@ -207,3 +208,14 @@ fn initial_controllers_command( ), } } + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn test_constants() { + // Test that dereferencing the constants does not panic. + let _ = *KAFKA_LOG4J_OPTS; + } +} diff --git a/rust/operator-binary/src/controller/build/kerberos.rs b/rust/operator-binary/src/controller/build/kerberos.rs index 676c45b0c..624525f71 100644 --- a/rust/operator-binary/src/controller/build/kerberos.rs +++ b/rust/operator-binary/src/controller/build/kerberos.rs @@ -1,3 +1,5 @@ +use std::str::FromStr; + use snafu::{ResultExt, Snafu}; use stackable_operator::{ builder::{ @@ -12,6 +14,8 @@ use stackable_operator::{ }, }, commons::secret_class::SecretClassVolumeProvisionParts, + constant, + v2::builder::pod::container::{EnvVarName, EnvVarSet}, }; use crate::{ @@ -67,13 +71,42 @@ pub fn add_kerberos_pod_config( for cb in [cb_kafka, cb_kcat_prober] { cb.add_volume_mount("kerberos", STACKABLE_KERBEROS_DIR) .context(AddVolumeMountSnafu)?; - cb.add_env_var("KRB5_CONFIG", STACKABLE_KERBEROS_KRB5_PATH); - cb.add_env_var( - "KAFKA_OPTS", - format!("-Djava.security.auth.login.config=/tmp/jaas.properties -Djava.security.krb5.conf={STACKABLE_KERBEROS_KRB5_PATH}",), - ); } } Ok(()) } + +constant!(KRB5_CONFIG: EnvVarName = "KRB5_CONFIG"); +constant!(KAFKA_OPTS: EnvVarName = "KAFKA_OPTS"); + +/// The environment variables the Kerberos configuration requires on the Kafka and kcat-prober +/// containers, or an empty set when Kerberos is disabled. +/// +/// Returned as an [`EnvVarSet`] (rather than added to the containers directly) so the callers +/// can merge the user's `envOverrides` on top, letting an override win on a name collision. +pub fn kerberos_env_vars(kafka_security: &ValidatedKafkaSecurity) -> EnvVarSet { + if !kafka_security.has_kerberos_enabled() { + return EnvVarSet::new(); + } + EnvVarSet::new() + .with_value(&KRB5_CONFIG, STACKABLE_KERBEROS_KRB5_PATH) + .with_value( + &KAFKA_OPTS, + format!( + "-Djava.security.auth.login.config=/tmp/jaas.properties -Djava.security.krb5.conf={STACKABLE_KERBEROS_KRB5_PATH}" + ), + ) +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn test_constants() { + // Test that dereferencing the constants does not panic. + let _ = *KRB5_CONFIG; + let _ = *KAFKA_OPTS; + } +} diff --git a/rust/operator-binary/src/controller/build/mod.rs b/rust/operator-binary/src/controller/build/mod.rs index 9bf436bb9..ad5d2b304 100644 --- a/rust/operator-binary/src/controller/build/mod.rs +++ b/rust/operator-binary/src/controller/build/mod.rs @@ -3,10 +3,12 @@ use std::marker::PhantomData; use snafu::{ResultExt, Snafu}; +use stackable_operator::{kvp::Labels, v2::kvp::label}; use crate::{ controller::{ - KubernetesResources, Prepared, RoleGroupName, ValidatedCluster, + CONTROLLER_NAME, KubernetesResources, OPERATOR_NAME, PRODUCT_NAME, Prepared, RoleGroupName, + RoleName, ValidatedCluster, build::{ properties::{ listener::get_kafka_listener_config, product_logging::vector_config_file_content, @@ -159,6 +161,70 @@ pub fn build(cluster: &ValidatedCluster) -> Result }) } +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/resource/config_map.rs b/rust/operator-binary/src/controller/build/resource/config_map.rs index 284a281b7..a1be2a907 100644 --- a/rust/operator-binary/src/controller/build/resource/config_map.rs +++ b/rust/operator-binary/src/controller/build/resource/config_map.rs @@ -17,6 +17,7 @@ use crate::{ properties::{ ConfigFileName, config_file_name, product_logging::role_group_config_map_data, }, + recommended_labels_for_role_group_resources, security::client_properties, }, }, @@ -133,7 +134,11 @@ pub fn build_rolegroup_config_map( None, Some(true), )) - .with_labels(validated_cluster.recommended_labels(&role, role_group_name)) + .with_labels(recommended_labels_for_role_group_resources( + validated_cluster, + &role, + role_group_name, + )) .build(), ) .add_data( diff --git a/rust/operator-binary/src/controller/build/resource/discovery.rs b/rust/operator-binary/src/controller/build/resource/discovery.rs index 299598cb3..2dd1c7fda 100644 --- a/rust/operator-binary/src/controller/build/resource/discovery.rs +++ b/rust/operator-binary/src/controller/build/resource/discovery.rs @@ -1,4 +1,4 @@ -use std::{num::TryFromIntError, str::FromStr}; +use std::num::TryFromIntError; use snafu::{ResultExt, Snafu}; use stackable_operator::{ @@ -9,7 +9,7 @@ use stackable_operator::{ }; use crate::{ - controller::{RoleGroupName, ValidatedCluster}, + controller::{ValidatedCluster, build::recommended_labels_for_role_resources}, crd::role::KafkaRole, }; @@ -68,13 +68,10 @@ pub fn build_discovery_configmap(validated_cluster: &ValidatedCluster) -> Result None, Some(true), )) - .with_labels( - validated_cluster.recommended_labels( - &KafkaRole::Broker, - &RoleGroupName::from_str("discovery") - .expect("'discovery' is a valid role group name"), - ), - ) + .with_labels(recommended_labels_for_role_resources( + validated_cluster, + &KafkaRole::Broker, + )) .build(), ) .add_data("KAFKA", bootstrap_servers) diff --git a/rust/operator-binary/src/controller/build/resource/listener.rs b/rust/operator-binary/src/controller/build/resource/listener.rs index bc625b122..997c84cbb 100644 --- a/rust/operator-binary/src/controller/build/resource/listener.rs +++ b/rust/operator-binary/src/controller/build/resource/listener.rs @@ -11,7 +11,10 @@ use stackable_operator::{ }; use crate::{ - controller::{RoleGroupName, ValidatedCluster, security::ValidatedKafkaSecurity}, + controller::{ + RoleGroupName, ValidatedCluster, build::recommended_labels_for_role_group_resources, + security::ValidatedKafkaSecurity, + }, crd::role::{KafkaRole, broker::BrokerConfig}, }; @@ -44,7 +47,7 @@ pub fn bootstrap_listener_name( let resource_names = ResourceNames { cluster_name: cluster_name.clone(), - role_name: role.into(), + role_name: (**role).clone(), role_group_name: role_group_name.clone(), }; @@ -75,7 +78,11 @@ pub fn build_broker_rolegroup_bootstrap_listener( None, Some(true), )) - .with_labels(validated_cluster.recommended_labels(role, role_group_name)) + .with_labels(recommended_labels_for_role_group_resources( + validated_cluster, + role, + role_group_name, + )) .build(), spec: listener::v1alpha1::ListenerSpec { class_name: Some(merged_config.bootstrap_listener_class.to_string()), diff --git a/rust/operator-binary/src/controller/build/resource/pdb.rs b/rust/operator-binary/src/controller/build/resource/pdb.rs index a8777170b..af647fa63 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::role::KafkaRole, }; @@ -23,10 +23,10 @@ pub fn build_pdb( }); let pdb = pod_disruption_budget_builder_with_role( validated_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 a26d067d4..1dfecd57a 100644 --- a/rust/operator-binary/src/controller/build/resource/rbac.rs +++ b/rust/operator-binary/src/controller/build/resource/rbac.rs @@ -1,27 +1,18 @@ //! Builds the RBAC resources (ServiceAccount + RoleBinding) shared by all role groups. -use std::str::FromStr; - use stackable_operator::{ k8s_openapi::api::{core::v1::ServiceAccount, rbac::v1::RoleBinding}, - kvp::Labels, - v2::{ - rbac, - types::operator::{RoleGroupName, RoleName}, - }, + v2::rbac, }; -use crate::controller::ValidatedCluster; - -stackable_operator::constant!(NONE_ROLE_NAME: RoleName = "none"); -stackable_operator::constant!(NONE_ROLE_GROUP_NAME: RoleGroupName = "none"); +use crate::controller::{ValidatedCluster, build::recommended_labels_for_cluster_resources}; /// Builds the [`ServiceAccount`] that the role-group Pods run under. pub fn build_service_account(cluster: &ValidatedCluster) -> ServiceAccount { rbac::build_service_account( cluster, &cluster.cluster_resource_names(), - rbac_labels(cluster), + recommended_labels_for_cluster_resources(cluster), ) } @@ -31,16 +22,10 @@ pub fn build_role_binding(cluster: &ValidatedCluster) -> RoleBinding { rbac::build_role_binding( cluster, &cluster.cluster_resource_names(), - rbac_labels(cluster), + recommended_labels_for_cluster_resources(cluster), ) } -/// Both resources are shared by the whole cluster rather than tied to a role or role group, so -/// the recommended labels carry `none` for both values. -fn rbac_labels(cluster: &ValidatedCluster) -> Labels { - cluster.recommended_labels_for(&NONE_ROLE_NAME, &NONE_ROLE_GROUP_NAME) -} - #[cfg(test)] mod tests { use serde_json::json; @@ -83,13 +68,12 @@ mod tests { "apiVersion": "v1", "kind": "ServiceAccount", "metadata": { - // The RBAC resources are cluster-shared, so role and role group are `none`. + // The RBAC resources are cluster-shared, so they carry no component or + // role-group label. "labels": { - "app.kubernetes.io/component": "none", "app.kubernetes.io/instance": "simple-kafka", "app.kubernetes.io/managed-by": "kafka.stackable.tech_kafkacluster", "app.kubernetes.io/name": "kafka", - "app.kubernetes.io/role-group": "none", "app.kubernetes.io/version": app_version_label("3.9.2"), "stackable.tech/vendor": "Stackable" }, @@ -120,11 +104,9 @@ mod tests { "kind": "RoleBinding", "metadata": { "labels": { - "app.kubernetes.io/component": "none", "app.kubernetes.io/instance": "simple-kafka", "app.kubernetes.io/managed-by": "kafka.stackable.tech_kafkacluster", "app.kubernetes.io/name": "kafka", - "app.kubernetes.io/role-group": "none", "app.kubernetes.io/version": app_version_label("3.9.2"), "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 be9801ed8..b1d58858e 100644 --- a/rust/operator-binary/src/controller/build/resource/service.rs +++ b/rust/operator-binary/src/controller/build/resource/service.rs @@ -8,7 +8,11 @@ use stackable_operator::{ }; use crate::{ - controller::{RoleGroupName, ValidatedCluster, security::ValidatedKafkaSecurity}, + controller::{ + RoleGroupName, ValidatedCluster, + build::{recommended_labels_for_role_group_resources, role_group_selector}, + security::ValidatedKafkaSecurity, + }, crd::{METRICS_PORT, METRICS_PORT_NAME, role::KafkaRole}, }; @@ -35,16 +39,16 @@ pub fn build_rolegroup_headless_service( None, Some(true), )) - .with_labels(validated_cluster.recommended_labels(role, role_group_name)) + .with_labels(recommended_labels_for_role_group_resources( + validated_cluster, + role, + role_group_name, + )) .build(), spec: Some(ServiceSpec { cluster_ip: Some("None".to_string()), ports: Some(headless_ports(kafka_security)), - selector: Some( - validated_cluster - .role_group_selector(role, role_group_name) - .into(), - ), + selector: Some(role_group_selector(validated_cluster, role, role_group_name).into()), publish_not_ready_addresses: Some(true), ..ServiceSpec::default() }), @@ -72,7 +76,11 @@ pub fn build_rolegroup_metrics_service( None, Some(true), )) - .with_labels(validated_cluster.recommended_labels(role, role_group_name)) + .with_labels(recommended_labels_for_role_group_resources( + validated_cluster, + role, + role_group_name, + )) .with_labels(prometheus_labels(&Scraping::Enabled)) .with_annotations(prometheus_annotations( &Scraping::Enabled, @@ -86,11 +94,7 @@ pub fn build_rolegroup_metrics_service( type_: Some("ClusterIP".to_string()), cluster_ip: Some("None".to_string()), ports: Some(metrics_ports()), - selector: Some( - validated_cluster - .role_group_selector(role, role_group_name) - .into(), - ), + selector: Some(role_group_selector(validated_cluster, role, 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 c9147c551..063d62325 100644 --- a/rust/operator-binary/src/controller/build/resource/statefulset.rs +++ b/rust/operator-binary/src/controller/build/resource/statefulset.rs @@ -19,8 +19,8 @@ use stackable_operator::{ api::{ apps::v1::{StatefulSet, StatefulSetSpec, StatefulSetUpdateStrategy}, core::v1::{ - ConfigMapVolumeSource, ContainerPort, EnvVar, EnvVarSource, ExecAction, - ObjectFieldSelector, PodSpec, Probe, TCPSocketAction, Volume, + ConfigMapVolumeSource, ContainerPort, EnvVar, ExecAction, PodSpec, Probe, + TCPSocketAction, Volume, }, }, apimachinery::pkg::{apis::meta::v1::LabelSelector, util::intstr::IntOrString}, @@ -48,12 +48,14 @@ use crate::{ RoleGroupName, ValidatedCluster, ValidatedRoleGroupConfig, build::{ command::{ - broker_kafka_container_commands, controller_kafka_container_command, - kafka_log_opts, kafka_log_opts_env_var, + KAFKA_LOG4J_OPTS, broker_kafka_container_commands, + controller_kafka_container_command, kafka_log_opts, }, graceful_shutdown::add_graceful_shutdown_config, - kerberos::add_kerberos_pod_config, + kerberos::{add_kerberos_pod_config, kerberos_env_vars}, properties::product_logging::MAX_KAFKA_LOG_FILES_SIZE, + recommended_labels_for_role_group_resources, + recommended_labels_for_unversioned_role_group_resources, role_group_selector, security::{ add_broker_volume_and_volume_mounts, add_controller_volume_and_volume_mounts, kcat_prober_container_commands, @@ -81,15 +83,21 @@ use crate::{ stackable_operator::constant!(VECTOR_CONFIG_VOLUME_NAME: VolumeName = "config"); stackable_operator::constant!(VECTOR_LOG_VOLUME_NAME: VolumeName = "log"); -/// Name of both the env var and the ZooKeeper discovery ConfigMap key holding the -/// ZooKeeper connection string. -const ZOOKEEPER_ENV_VAR_NAME: &str = "ZOOKEEPER"; - -/// Parses a compile-time-known env var name; panics only on a programming error (a malformed -/// literal in this file). -fn env_var_name(name: &str) -> EnvVarName { - EnvVarName::from_str(name).expect("a static env var name is valid") -} +// Env vars the operator sets on the Kafka containers. +stackable_operator::constant!(POD_NAME: EnvVarName = "POD_NAME"); +stackable_operator::constant!(KAFKA_CLIENT_PORT: EnvVarName = "KAFKA_CLIENT_PORT"); +stackable_operator::constant!(NAMESPACE: EnvVarName = "NAMESPACE"); +stackable_operator::constant!(ROLEGROUP_HEADLESS_SERVICE_NAME: EnvVarName = "ROLEGROUP_HEADLESS_SERVICE_NAME"); +stackable_operator::constant!(CLUSTER_DOMAIN: EnvVarName = "CLUSTER_DOMAIN"); +stackable_operator::constant!(PRE_STOP_CONTROLLER_SLEEP_SECONDS: EnvVarName = "PRE_STOP_CONTROLLER_SLEEP_SECONDS"); +stackable_operator::constant!(EXTRA_ARGS: EnvVarName = "EXTRA_ARGS"); +// Needed for the `containerdebug` process to log its tracing information to. +stackable_operator::constant!(CONTAINERDEBUG_LOG_DIRECTORY: EnvVarName = "CONTAINERDEBUG_LOG_DIRECTORY"); + +// The env var and the ZooKeeper discovery ConfigMap key holding the ZooKeeper connection +// string (the same string, as the env var name is used as the ConfigMap key). +stackable_operator::constant!(ZOOKEEPER: EnvVarName = "ZOOKEEPER"); +stackable_operator::constant!(ZOOKEEPER_CONFIG_MAP_KEY: ConfigMapKey = "ZOOKEEPER"); /// Environment variables the operator sets on the Kafka container that are common to broker and /// controller role groups. @@ -103,21 +111,17 @@ fn common_operator_env_vars( kafka_security: &ValidatedKafkaSecurity, ) -> EnvVarSet { let mut env = EnvVarSet::new() - .with_field_path(&env_var_name("POD_NAME"), &FieldPathEnvVar::Name) - .with_value( - &env_var_name("KAFKA_CLIENT_PORT"), - kafka_security.client_port().to_string(), - ); + .with_field_path(&POD_NAME, &FieldPathEnvVar::Name) + .with_value(&KAFKA_CLIENT_PORT, kafka_security.client_port().to_string()); // Present in ZooKeeper mode only: brokers use it to connect, controllers for migration. if let Some(zookeeper_config_map_name) = &validated_cluster.cluster_config.zookeeper_config_map_name { env = env.with_config_map_key_ref( - &env_var_name(ZOOKEEPER_ENV_VAR_NAME), + &ZOOKEEPER, zookeeper_config_map_name, - &ConfigMapKey::from_str(ZOOKEEPER_ENV_VAR_NAME) - .expect("a static config map key is valid"), + &ZOOKEEPER_CONFIG_MAP_KEY, ); } @@ -192,10 +196,15 @@ pub fn build_broker_rolegroup_statefulset( let resolved_product_image = &validated_cluster.image; let merged_config = &validated_rg.config.config; let resource_names = validated_cluster.role_group_resource_names(kafka_role, role_group_name); - let recommended_labels = validated_cluster.recommended_labels(kafka_role, role_group_name); - // Used for PVC templates that cannot be modified once they are deployed - let unversioned_recommended_labels = - validated_cluster.unversioned_recommended_labels(kafka_role, role_group_name); + let recommended_labels = + recommended_labels_for_role_group_resources(validated_cluster, kafka_role, 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( + validated_cluster, + kafka_role, + role_group_name, + ); let kcat_prober_container_name = BrokerContainer::KcatProber.to_string(); let mut cb_kcat_prober = @@ -250,8 +259,18 @@ pub fn build_broker_rolegroup_statefulset( .context(AddKerberosConfigSnafu)?; } - // Operator-set env vars first; the user's `envOverrides` are merged on top and win. + // Operator-set env vars first; the user's `envOverrides` are merged on top last and win. let env: Vec = common_operator_env_vars(validated_cluster, kafka_security) + .merge(common_kafka_env( + merged_config, + &validated_rg + .product_specific_common_config + .jvm_argument_overrides, + resolved_product_image, + kafka_role, + role_group_name, + )?) + .merge(kerberos_env_vars(kafka_security)) .merge(validated_rg.env_overrides.clone()) .into(); @@ -274,17 +293,6 @@ pub fn build_broker_rolegroup_statefulset( &resolved_product_image.product_version, )]); - add_common_kafka_env( - &mut cb_kafka, - merged_config, - &validated_rg - .product_specific_common_config - .jvm_argument_overrides, - resolved_product_image, - kafka_role, - role_group_name, - )?; - cb_kafka .add_env_vars(env) .add_container_ports(container_ports(kafka_security)) @@ -310,17 +318,11 @@ pub fn build_broker_rolegroup_statefulset( cb_kcat_prober .image_from_product_image(resolved_product_image) .command(vec!["sleep".to_string(), "infinity".to_string()]) - .add_env_vars(vec![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() - }]) + .add_env_vars(Vec::::from( + EnvVarSet::new() + .with_field_path(&POD_NAME, &FieldPathEnvVar::Name) + .merge(kerberos_env_vars(kafka_security)), + )) .resources( ResourceRequirementsBuilder::new() .with_cpu_request("100m") @@ -436,9 +438,7 @@ pub fn build_broker_rolegroup_statefulset( replicas: validated_rg.replicas.map(i32::from), selector: LabelSelector { match_labels: Some( - validated_cluster - .role_group_selector(kafka_role, role_group_name) - .into(), + role_group_selector(validated_cluster, kafka_role, role_group_name).into(), ), ..LabelSelector::default() }, @@ -462,7 +462,8 @@ pub fn build_controller_rolegroup_statefulset( let resolved_product_image = &validated_cluster.image; let merged_config = &validated_rg.config.config; let resource_names = validated_cluster.role_group_resource_names(kafka_role, role_group_name); - let recommended_labels = validated_cluster.recommended_labels(kafka_role, role_group_name); + let recommended_labels = + recommended_labels_for_role_group_resources(validated_cluster, kafka_role, role_group_name); let kafka_container_name = ControllerContainer::Kafka.to_string(); let mut cb_kafka = @@ -473,18 +474,27 @@ pub fn build_controller_rolegroup_statefulset( let mut pod_builder = PodBuilder::new(); // Operator-set env vars first (common + controller-specific); the user's `envOverrides` - // are merged on top and win. + // are merged on top last and win. let env: Vec = common_operator_env_vars(validated_cluster, kafka_security) - .with_field_path(&env_var_name("NAMESPACE"), &FieldPathEnvVar::Namespace) + .with_field_path(&NAMESPACE, &FieldPathEnvVar::Namespace) .with_value( - &env_var_name("ROLEGROUP_HEADLESS_SERVICE_NAME"), + &ROLEGROUP_HEADLESS_SERVICE_NAME, resource_names.headless_service_name().to_string(), ) .with_value( - &env_var_name("CLUSTER_DOMAIN"), + &CLUSTER_DOMAIN, validated_cluster.cluster_domain.to_string(), ) - .with_value(&env_var_name("PRE_STOP_CONTROLLER_SLEEP_SECONDS"), "10") + .with_value(&PRE_STOP_CONTROLLER_SLEEP_SECONDS, "10") + .merge(common_kafka_env( + merged_config, + &validated_rg + .product_specific_common_config + .jvm_argument_overrides, + resolved_product_image, + kafka_role, + role_group_name, + )?) .merge(validated_rg.env_overrides.clone()) .into(); @@ -504,17 +514,6 @@ pub fn build_controller_rolegroup_statefulset( &resolved_product_image.product_version, )]); - add_common_kafka_env( - &mut cb_kafka, - merged_config, - &validated_rg - .product_specific_common_config - .jvm_argument_overrides, - resolved_product_image, - kafka_role, - role_group_name, - )?; - cb_kafka .add_env_vars(env) .add_container_ports(container_ports(kafka_security)) @@ -625,9 +624,7 @@ pub fn build_controller_rolegroup_statefulset( replicas: validated_rg.replicas.map(i32::from), selector: LabelSelector { match_labels: Some( - validated_cluster - .role_group_selector(kafka_role, role_group_name) - .into(), + role_group_selector(validated_cluster, kafka_role, role_group_name).into(), ), ..LabelSelector::default() }, @@ -669,45 +666,47 @@ fn container_ports(kafka_security: &ValidatedKafkaSecurity) -> Vec Result<(), Error> { - cb_kafka - .add_env_var( - "EXTRA_ARGS", +) -> Result { + Ok(EnvVarSet::new() + .with_value( + &EXTRA_ARGS, crate::controller::build::jvm::construct_non_heap_jvm_args( merged_config, jvm_argument_overrides, ) .context(ConstructJvmArgumentsSnafu)?, ) - .add_env_var( - KAFKA_HEAP_OPTS, + .with_value( + &KAFKA_HEAP_OPTS, crate::controller::build::jvm::construct_heap_jvm_args( merged_config, jvm_argument_overrides, ) .context(ConstructJvmArgumentsSnafu)?, ) - .add_env_var( - kafka_log_opts_env_var(), + .with_value( + &KAFKA_LOG4J_OPTS, kafka_log_opts(&resolved_product_image.product_version), ) - // Needed for the `containerdebug` process to log it's tracing information to. - .add_env_var( - "CONTAINERDEBUG_LOG_DIRECTORY", + .with_value( + &CONTAINERDEBUG_LOG_DIRECTORY, format!("{STACKABLE_LOG_DIR}/containerdebug"), ) - .add_env_var( - KAFKA_NODE_ID_OFFSET, + .with_value( + &KAFKA_NODE_ID_OFFSET, node_id_hash32_offset(kafka_role, role_group_name.as_ref()).to_string(), - ); - Ok(()) + )) } /// Adds the `log-config` volume, sourced either from the user-supplied custom log config @@ -801,3 +800,159 @@ fn add_vector_container( )); } } + +#[cfg(test)] +mod tests { + use super::*; + use crate::controller::test_support::{minimal_kafka, validated_cluster}; + + #[test] + fn test_constants() { + // Test that dereferencing the constants does not panic. + let _ = *VECTOR_CONFIG_VOLUME_NAME; + let _ = *VECTOR_LOG_VOLUME_NAME; + let _ = *POD_NAME; + let _ = *KAFKA_CLIENT_PORT; + let _ = *NAMESPACE; + let _ = *ROLEGROUP_HEADLESS_SERVICE_NAME; + let _ = *CLUSTER_DOMAIN; + let _ = *PRE_STOP_CONTROLLER_SLEEP_SECONDS; + let _ = *EXTRA_ARGS; + let _ = *CONTAINERDEBUG_LOG_DIRECTORY; + let _ = *ZOOKEEPER; + let _ = *ZOOKEEPER_CONFIG_MAP_KEY; + } + + /// The user-supplied `envOverrides` must be merged in after all operator-set environment + /// variables, so that they can override any of them. `CONTAINERDEBUG_LOG_DIRECTORY` is used + /// as the example here because it is set unconditionally by the operator. + #[test] + fn env_overrides_override_operator_set_env_vars() { + let kafka = minimal_kafka( + r#" + apiVersion: kafka.stackable.tech/v1alpha1 + kind: KafkaCluster + metadata: + name: simple-kafka + namespace: default + uid: 12345678-1234-1234-1234-123456789012 + spec: + image: + productVersion: 3.9.2 + clusterConfig: + zookeeperConfigMapName: xyz + brokers: + roleGroups: + default: + replicas: 1 + "#, + ); + let cluster = validated_cluster(&kafka); + let role_group_name = RoleGroupName::from_str("default").expect("valid role group name"); + let mut validated_rg = + cluster.role_group_configs[&KafkaRole::Broker][&role_group_name].clone(); + validated_rg.env_overrides = validated_rg + .env_overrides + .with_value(&CONTAINERDEBUG_LOG_DIRECTORY, "/custom/log/dir"); + + let stateful_set = build_broker_rolegroup_statefulset( + &KafkaRole::Broker, + &role_group_name, + &cluster, + &validated_rg, + ) + .expect("the StatefulSet builds"); + + let env = 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 == "kafka") + .expect("the kafka container exists") + .env + .expect("the kafka container has env vars"); + + let containerdebug: Vec<_> = env + .iter() + .filter(|env_var| env_var.name == "CONTAINERDEBUG_LOG_DIRECTORY") + .collect(); + assert_eq!( + containerdebug.len(), + 1, + "the override must replace the operator-set value, not duplicate it" + ); + assert_eq!(containerdebug[0].value.as_deref(), Some("/custom/log/dir")); + } + + /// Same guarantee for the controller role, whose env vars are assembled by a separate + /// builder ([`build_controller_rolegroup_statefulset`]). + #[test] + fn controller_env_overrides_override_operator_set_env_vars() { + let kafka = minimal_kafka( + r#" + apiVersion: kafka.stackable.tech/v1alpha1 + kind: KafkaCluster + metadata: + name: simple-kafka + namespace: default + uid: 12345678-1234-1234-1234-123456789012 + spec: + image: + productVersion: 3.9.2 + clusterConfig: + metadataManager: kraft + controllers: + roleGroups: + default: + replicas: 3 + brokers: + roleGroups: + default: + replicas: 3 + "#, + ); + let cluster = validated_cluster(&kafka); + let role_group_name = RoleGroupName::from_str("default").expect("valid role group name"); + let mut validated_rg = + cluster.role_group_configs[&KafkaRole::Controller][&role_group_name].clone(); + validated_rg.env_overrides = validated_rg + .env_overrides + .with_value(&PRE_STOP_CONTROLLER_SLEEP_SECONDS, "42"); + + let stateful_set = build_controller_rolegroup_statefulset( + &KafkaRole::Controller, + &role_group_name, + &cluster, + &validated_rg, + ) + .expect("the StatefulSet builds"); + + let env = 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 == "kafka") + .expect("the kafka container exists") + .env + .expect("the kafka container has env vars"); + + let sleep_seconds: Vec<_> = env + .iter() + .filter(|env_var| env_var.name == "PRE_STOP_CONTROLLER_SLEEP_SECONDS") + .collect(); + assert_eq!( + sleep_seconds.len(), + 1, + "the override must replace the operator-set value, not duplicate it" + ); + assert_eq!(sleep_seconds[0].value.as_deref(), Some("42")); + } +} diff --git a/rust/operator-binary/src/controller/node_id_hasher.rs b/rust/operator-binary/src/controller/node_id_hasher.rs index a8ae5f3cb..91b355554 100644 --- a/rust/operator-binary/src/controller/node_id_hasher.rs +++ b/rust/operator-binary/src/controller/node_id_hasher.rs @@ -7,7 +7,7 @@ use crate::crd::role::KafkaRole; /// The node.id is only set and used in Kraft mode. /// Warning: this is not safe from collisions. pub fn node_id_hash32_offset(role: &KafkaRole, role_group: &str) -> u32 { - let hash = fnv_hash32(&format!("{role}-{role_group}")); + let hash = fnv_hash32(&format!("{role}-{role_group}", role = role.as_ref())); let range = hash & 0x0000FFFF; // Kafka uses signed integer range * 0x00007FFF diff --git a/rust/operator-binary/src/controller/update_status.rs b/rust/operator-binary/src/controller/update_status.rs index 376f25ebb..3c24c96e6 100644 --- a/rust/operator-binary/src/controller/update_status.rs +++ b/rust/operator-binary/src/controller/update_status.rs @@ -12,7 +12,7 @@ use strum::{EnumDiscriminants, IntoStaticStr}; use crate::{ controller::{Applied, KubernetesResources}, - crd::{KafkaClusterStatus, OPERATOR_NAME, v1alpha1}, + crd::{KAFKA_OPERATOR_NAME, KafkaClusterStatus, v1alpha1}, }; #[derive(Snafu, Debug, EnumDiscriminants)] @@ -47,7 +47,7 @@ pub async fn update_status( }; client - .apply_patch_status(OPERATOR_NAME, kafka, &status) + .apply_patch_status(KAFKA_OPERATOR_NAME, kafka, &status) .await .context(ApplyStatusSnafu)?; diff --git a/rust/operator-binary/src/controller/validate.rs b/rust/operator-binary/src/controller/validate.rs index 35405e63f..ec747fd71 100644 --- a/rust/operator-binary/src/controller/validate.rs +++ b/rust/operator-binary/src/controller/validate.rs @@ -11,9 +11,10 @@ use stackable_operator::{ cli::OperatorEnvironmentOptions, commons::product_image_selection, config::{fragment::FromFragment, merge::Merge}, + constant, kube::ResourceExt, product_logging::spec::Logging, - role_utils::{GenericRoleConfig, Role}, + role_utils::GenericRoleConfig, schemars::JsonSchema, v2::{ builder::pod::container::{EnvVarName, EnvVarSet}, @@ -22,7 +23,7 @@ use stackable_operator::{ ValidatedContainerLogConfigChoice, VectorContainerLogConfig, validate_logging_configuration_for_container, }, - role_utils::{JavaCommonConfig, with_validated_config}, + role_utils::{JavaCommonConfig, Role, with_validated_config}, types::kubernetes::ConfigMapName, }, }; @@ -46,8 +47,8 @@ use crate::{ }, }; -/// The operator-managed env var carrying the Kafka cluster id. -const KAFKA_CLUSTER_ID_ENV: &str = "KAFKA_CLUSTER_ID"; +// The operator-managed env var carrying the Kafka cluster id. +constant!(KAFKA_CLUSTER_ID: EnvVarName = "KAFKA_CLUSTER_ID"); #[derive(Snafu, Debug)] pub enum Error { @@ -67,11 +68,6 @@ pub enum Error { source: stackable_operator::config::fragment::ValidationError, }, - #[snafu(display("invalid environment variable name"))] - InvalidEnvVarName { - source: stackable_operator::v2::macros::attributed_string_type::Error, - }, - #[snafu(display("invalid metadata manager"))] InvalidMetadataManager { source: crate::crd::Error }, @@ -357,14 +353,9 @@ where >(role_group, role, &default_config) .context(ValidateRoleGroupConfigSnafu)?; - // The merge returns env overrides as a HashMap. Convert to an - // EnvVarSet (validating names early), then inject KAFKA_CLUSTER_ID. - let mut env_overrides = EnvVarSet::new(); - for (name, value) in merged.config.env_overrides { - let name = EnvVarName::from_str(&name).context(InvalidEnvVarNameSnafu)?; - env_overrides = env_overrides.with_value(&name, value); - } - let env_overrides = inject_cluster_id(env_overrides, cluster_id)?; + // The env override names are validated on deserialization; inject the + // operator-managed KAFKA_CLUSTER_ID (unless the user overrides it). + let env_overrides = inject_cluster_id(merged.config.env_overrides.into(), cluster_id); let logging = validate_logging(&merged.config.config, vector_aggregator_config_map_name)?; @@ -398,16 +389,15 @@ where /// Injects the operator-managed `KAFKA_CLUSTER_ID` into the merged env overrides, /// but only when the user has not already set it via `envOverrides` (user value /// wins). -fn inject_cluster_id(env_overrides: EnvVarSet, cluster_id: Option<&str>) -> Result { +fn inject_cluster_id(env_overrides: EnvVarSet, cluster_id: Option<&str>) -> EnvVarSet { let Some(cluster_id) = cluster_id else { - return Ok(env_overrides); + return env_overrides; }; - let name = EnvVarName::from_str(KAFKA_CLUSTER_ID_ENV).context(InvalidEnvVarNameSnafu)?; - if env_overrides.get(&name).is_some() { + if env_overrides.get(&KAFKA_CLUSTER_ID).is_some() { // The user set `KAFKA_CLUSTER_ID` via envOverrides; their value wins. - Ok(env_overrides) + env_overrides } else { - Ok(env_overrides.with_value(&name, cluster_id)) + env_overrides.with_value(&KAFKA_CLUSTER_ID, cluster_id) } } @@ -416,19 +406,23 @@ mod tests { use std::str::FromStr; use stackable_operator::v2::{ - builder::pod::container::{EnvVarName, EnvVarSet}, - types::operator::RoleGroupName, + builder::pod::container::EnvVarSet, types::operator::RoleGroupName, }; - use super::{KAFKA_CLUSTER_ID_ENV, inject_cluster_id}; + use super::{KAFKA_CLUSTER_ID, inject_cluster_id}; use crate::{ controller::test_support::{app_version_label, minimal_kafka, validated_cluster}, crd::role::KafkaRole, }; + #[test] + fn test_constants() { + // Test that dereferencing the constants does not panic. + let _ = *KAFKA_CLUSTER_ID; + } + fn cluster_id_value(env: &EnvVarSet) -> Option { - let name = EnvVarName::from_str(KAFKA_CLUSTER_ID_ENV).unwrap(); - env.get(&name).and_then(|var| var.value.clone()) + env.get(&KAFKA_CLUSTER_ID).and_then(|var| var.value.clone()) } /// Locks every value the validate step itself derives from the minimal KRaft fixture — so a @@ -521,23 +515,22 @@ mod tests { #[test] fn injects_cluster_id_when_absent() { - let env = inject_cluster_id(EnvVarSet::new(), Some("my-id")).unwrap(); + let env = inject_cluster_id(EnvVarSet::new(), Some("my-id")); assert_eq!(cluster_id_value(&env), Some("my-id".to_string())); } #[test] fn user_cluster_id_override_wins() { - let name = EnvVarName::from_str(KAFKA_CLUSTER_ID_ENV).unwrap(); - let env = EnvVarSet::new().with_value(&name, "user-value"); + let env = EnvVarSet::new().with_value(&KAFKA_CLUSTER_ID, "user-value"); - let env = inject_cluster_id(env, Some("operator-value")).unwrap(); + let env = inject_cluster_id(env, Some("operator-value")); assert_eq!(cluster_id_value(&env), Some("user-value".to_string())); } #[test] fn without_cluster_id_nothing_is_injected() { - let env = inject_cluster_id(EnvVarSet::new(), None).unwrap(); + let env = inject_cluster_id(EnvVarSet::new(), None); assert_eq!(cluster_id_value(&env), None); } } diff --git a/rust/operator-binary/src/crd/mod.rs b/rust/operator-binary/src/crd/mod.rs index 487a478cb..c2d118256 100644 --- a/rust/operator-binary/src/crd/mod.rs +++ b/rust/operator-binary/src/crd/mod.rs @@ -5,6 +5,8 @@ pub mod listener; pub mod role; pub mod tls; +use std::str::FromStr; + use authentication::KafkaAuthentication; use serde::{Deserialize, Serialize}; use snafu::Snafu; @@ -14,14 +16,16 @@ use stackable_operator::{ product_image_selection::ProductImage, }, config::merge::Merge, + constant, deep_merger::ObjectOverrides, kube::{CustomResource, runtime::reflector::ObjectRef}, - role_utils::{GenericRoleConfig, Role}, + role_utils::GenericRoleConfig, schemars::{self, JsonSchema}, status::condition::{ClusterCondition, HasStatusCondition}, v2::{ + builder::pod::container::EnvVarName, config_overrides::KeyValueConfigOverrides, - role_utils::JavaCommonConfig, + role_utils::{JavaCommonConfig, Role}, types::{ common::Port, kubernetes::{ConfigMapName, NamespaceName, ServiceName, StatefulSetName}, @@ -39,13 +43,13 @@ use crate::crd::{ pub const CONTAINER_IMAGE_BASE_NAME: &str = "kafka"; pub const APP_NAME: &str = "kafka"; -pub const OPERATOR_NAME: &str = "kafka.stackable.tech"; +pub const KAFKA_OPERATOR_NAME: &str = "kafka.stackable.tech"; pub const FIELD_MANAGER: &str = "kafka-operator"; // metrics pub const METRICS_PORT_NAME: &str = "metrics"; pub const METRICS_PORT: Port = Port(9606); // env vars -pub const KAFKA_HEAP_OPTS: &str = "KAFKA_HEAP_OPTS"; +constant!(pub KAFKA_HEAP_OPTS: EnvVarName = "KAFKA_HEAP_OPTS"); // server_properties pub const LOG_DIRS_VOLUME_NAME: &str = "log-dirs"; // directories @@ -405,6 +409,12 @@ mod tests { use super::*; + #[test] + fn test_constants() { + // Test that dereferencing the constants does not panic. + let _ = *KAFKA_HEAP_OPTS; + } + fn get_server_secret_class(kafka: &v1alpha1::KafkaCluster) -> Option { kafka .spec diff --git a/rust/operator-binary/src/crd/role/mod.rs b/rust/operator-binary/src/crd/role/mod.rs index 972d3d567..c74276fe8 100644 --- a/rust/operator-binary/src/crd/role/mod.rs +++ b/rust/operator-binary/src/crd/role/mod.rs @@ -4,17 +4,17 @@ pub mod controller; use std::{borrow::Cow, ops::Deref, str::FromStr}; -use serde::{Deserialize, Serialize}; use stackable_operator::{ commons::resources::{NoRuntimeLimits, Resources}, + constant, product_logging::spec::ContainerLogConfig, - schemars::{self, JsonSchema}, v2::{ + builder::pod::container::EnvVarName, config_overrides::KeyValueConfigOverrides, types::{kubernetes::ListenerClassName, operator::RoleName}, }, }; -use strum::{Display, EnumIter, EnumString, IntoEnumIterator}; +use strum::{EnumIter, IntoEnumIterator}; use crate::{ crd::role::{ @@ -25,8 +25,7 @@ use crate::{ v1alpha1, }; -/// Env var -pub const KAFKA_NODE_ID_OFFSET: &str = "NODE_ID_OFFSET"; +constant!(pub KAFKA_NODE_ID_OFFSET: EnvVarName = "NODE_ID_OFFSET"); /// Past versions of the operator didn't set this explicitly and allowed Kafka to generate random ids. /// To support Kraft migration, this must be carried over to `KAFKA_NODE_ID` so the operator needs @@ -66,37 +65,23 @@ pub const KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: &str = "listener.security.protoc /// For example: localhost:9092,localhost:9093,localhost:9094. pub const KAFKA_CONTROLLER_QUORUM_BOOTSTRAP_SERVERS: &str = "controller.quorum.bootstrap.servers"; -#[derive( - Clone, - Debug, - Deserialize, - Display, - EnumIter, - Eq, - Hash, - JsonSchema, - Ord, - PartialEq, - PartialOrd, - Serialize, - EnumString, -)] +constant!(BROKER_ROLE_NAME: RoleName = "broker"); +constant!(CONTROLLER_ROLE_NAME: RoleName = "controller"); + +#[derive(Clone, Debug, EnumIter, Eq, Hash, Ord, PartialEq, PartialOrd)] pub enum KafkaRole { - #[strum(serialize = "broker")] Broker, - #[strum(serialize = "controller")] Controller, } -impl From for RoleName { - fn from(value: KafkaRole) -> Self { - RoleName::from_str(&value.to_string()).expect("a KafkaRole is a valid role name") - } -} +impl Deref for KafkaRole { + type Target = RoleName; -impl From<&KafkaRole> for RoleName { - fn from(value: &KafkaRole) -> Self { - RoleName::from_str(&value.to_string()).expect("a KafkaRole is a valid role name") + fn deref(&self) -> &Self::Target { + match self { + KafkaRole::Broker => &BROKER_ROLE_NAME, + KafkaRole::Controller => &CONTROLLER_ROLE_NAME, + } } } @@ -199,3 +184,16 @@ impl AnyConfigOverrides { } } } + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn test_constants() { + // Test that dereferencing the constants does not panic. + let _ = *BROKER_ROLE_NAME; + let _ = *CONTROLLER_ROLE_NAME; + let _ = *KAFKA_NODE_ID_OFFSET; + } +} diff --git a/rust/operator-binary/src/main.rs b/rust/operator-binary/src/main.rs index 7145bf1c8..29cc7efa7 100644 --- a/rust/operator-binary/src/main.rs +++ b/rust/operator-binary/src/main.rs @@ -36,7 +36,7 @@ use stackable_operator::{ use crate::{ controller::KAFKA_FULL_CONTROLLER_NAME, - crd::{KafkaCluster, KafkaClusterVersion, OPERATOR_NAME, v1alpha1}, + crd::{KAFKA_OPERATOR_NAME, KafkaCluster, KafkaClusterVersion, v1alpha1}, webhooks::conversion::create_webhook_server, }; @@ -104,9 +104,11 @@ async fn main() -> anyhow::Result<()> { .run(sigterm_watcher.handle()) .map(anyhow::Ok); - let client = - client::initialize_operator(Some(OPERATOR_NAME.to_string()), &common.cluster_info) - .await?; + let client = client::initialize_operator( + Some(KAFKA_OPERATOR_NAME.to_string()), + &common.cluster_info, + ) + .await?; let webhook_server = create_webhook_server( &operator_environment, diff --git a/tests/templates/kuttl/smoke-kraft/33-assert.yaml.j2 b/tests/templates/kuttl/smoke-kraft/33-assert.yaml.j2 index 90ee00d32..f0876558c 100644 --- a/tests/templates/kuttl/smoke-kraft/33-assert.yaml.j2 +++ b/tests/templates/kuttl/smoke-kraft/33-assert.yaml.j2 @@ -46,7 +46,6 @@ metadata: app.kubernetes.io/instance: test-kafka app.kubernetes.io/managed-by: kafka.stackable.tech_kafkacluster app.kubernetes.io/name: kafka - app.kubernetes.io/role-group: discovery app.kubernetes.io/version: "{{ test_scenario['values']['kafka-kraft'].split(',')[0] }}-stackable0.0.0-dev" stackable.tech/vendor: Stackable ownerReferences: diff --git a/tests/templates/kuttl/smoke/34-assert.yaml.j2 b/tests/templates/kuttl/smoke/34-assert.yaml.j2 index dff06328a..607cb0b0d 100644 --- a/tests/templates/kuttl/smoke/34-assert.yaml.j2 +++ b/tests/templates/kuttl/smoke/34-assert.yaml.j2 @@ -410,7 +410,6 @@ metadata: app.kubernetes.io/instance: test-kafka app.kubernetes.io/managed-by: kafka.stackable.tech_kafkacluster app.kubernetes.io/name: kafka - app.kubernetes.io/role-group: discovery app.kubernetes.io/version: "{{ test_scenario['values']['kafka'].split(',')[0] }}-stackable0.0.0-dev" stackable.tech/vendor: Stackable ownerReferences: From 75ffd532303b6ce0610cc1c3f5674ff2b469bc02 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Tue, 18 Aug 2026 17:39:11 +0200 Subject: [PATCH 2/4] updated changelog with PR number --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d38049c0..d4d2282a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,12 +19,12 @@ All notable changes to this project will be documented in this file. - 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 ([#XXX]). + handling ([#1011]). - BREAKING: Remove the `app.kubernetes.io/component` and `app.kubernetes.io/role-group` labels from the resources they don't apply to (previously set to `none` or a placeholder value). Broker StatefulSets created by older operator versions cannot be updated in place: after the operator upgrade, delete each broker StatefulSet so that the operator immediately recreates it - with the new labels ([#XXX]). + with the new labels ([#1011]). ### Fixed @@ -37,7 +37,7 @@ All notable changes to this project will be documented in this file. [#994]: https://github.com/stackabletech/kafka-operator/pull/994 [#998]: https://github.com/stackabletech/kafka-operator/pull/998 [#1000]: https://github.com/stackabletech/kafka-operator/pull/1000 -[#XXX]: https://github.com/stackabletech/kafka-operator/pull/XXX +[#1011]: https://github.com/stackabletech/kafka-operator/pull/1011 ## [26.7.0] - 2026-07-21 From 5b70f40bc4907b17e069c3aa705274557ceec82e Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Wed, 19 Aug 2026 12:17:49 +0200 Subject: [PATCH 3/4] replace double deref with function --- rust/operator-binary/src/controller.rs | 2 +- .../src/controller/build/resource/listener.rs | 2 +- rust/operator-binary/src/crd/role/mod.rs | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/rust/operator-binary/src/controller.rs b/rust/operator-binary/src/controller.rs index b8634e4fa..15b53fa60 100644 --- a/rust/operator-binary/src/controller.rs +++ b/rust/operator-binary/src/controller.rs @@ -266,7 +266,7 @@ impl ValidatedCluster { ) -> ResourceNames { ResourceNames { cluster_name: self.name.clone(), - role_name: (**role).clone(), + role_name: role.role_name(), role_group_name: role_group_name.clone(), } } diff --git a/rust/operator-binary/src/controller/build/resource/listener.rs b/rust/operator-binary/src/controller/build/resource/listener.rs index 997c84cbb..d3cc299c5 100644 --- a/rust/operator-binary/src/controller/build/resource/listener.rs +++ b/rust/operator-binary/src/controller/build/resource/listener.rs @@ -47,7 +47,7 @@ pub fn bootstrap_listener_name( let resource_names = ResourceNames { cluster_name: cluster_name.clone(), - role_name: (**role).clone(), + role_name: role.role_name(), role_group_name: role_group_name.clone(), }; diff --git a/rust/operator-binary/src/crd/role/mod.rs b/rust/operator-binary/src/crd/role/mod.rs index c74276fe8..7c4e3168b 100644 --- a/rust/operator-binary/src/crd/role/mod.rs +++ b/rust/operator-binary/src/crd/role/mod.rs @@ -100,6 +100,13 @@ impl KafkaRole { pub fn kerberos_service_name(&self) -> &'static str { "kafka" } + + /// The type-safe name of this role, e.g. to build [`ResourceNames`][rn]. + /// + /// [rn]: stackable_operator::v2::role_group_utils::ResourceNames + pub fn role_name(&self) -> RoleName { + RoleName::clone(self) + } } /// Configuration for a role and rolegroup of an unknown type. From c0c0cc5ccfd3cf5d3a4a9074e49f61d6350fb86d Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Wed, 19 Aug 2026 12:18:30 +0200 Subject: [PATCH 4/4] Revert unintended change to chart_testing.yaml --- deploy/helm/chart_testing.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/deploy/helm/chart_testing.yaml b/deploy/helm/chart_testing.yaml index 253af46d2..82b39c265 100644 --- a/deploy/helm/chart_testing.yaml +++ b/deploy/helm/chart_testing.yaml @@ -1,4 +1,3 @@ ---- remote: origin target-branch: main chart-dirs: