From 3f7cd6926583e3c0ae2aafad4bc9552378998fad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Natalie=20Klestrup=20R=C3=B6ijezon?= Date: Thu, 3 Jul 2025 12:36:03 +0200 Subject: [PATCH] Use automatic cluster domain detection --- Cargo.lock | 224 ++---- Cargo.nix | 669 ++++-------------- Cargo.toml | 1 + crate-hashes.json | 14 +- .../templates/controller-deployment.yaml | 4 + .../templates/node-daemonset.yaml | 2 +- .../listener-operator/templates/roles.yaml | 6 + rust/operator-binary/src/main.rs | 20 +- 8 files changed, 237 insertions(+), 703 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2faf0c63..23b4765d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -201,7 +201,7 @@ dependencies = [ "serde_urlencoded", "sync_wrapper", "tokio", - "tower 0.5.2", + "tower", "tower-layer", "tower-service", "tracing", @@ -506,7 +506,7 @@ version = "0.0.0-dev" dependencies = [ "prost", "prost-types", - "tonic 0.13.1", + "tonic", "tonic-build", ] @@ -920,12 +920,6 @@ dependencies = [ "url", ] -[[package]] -name = "glob" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" - [[package]] name = "gloo-timers" version = "0.3.0" @@ -950,19 +944,13 @@ dependencies = [ "futures-core", "futures-sink", "http", - "indexmap 2.8.0", + "indexmap", "slab", "tokio", "tokio-util", "tracing", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - [[package]] name = "hashbrown" version = "0.15.2" @@ -1331,16 +1319,6 @@ dependencies = [ "icu_properties", ] -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - [[package]] name = "indexmap" version = "2.8.0" @@ -1348,9 +1326,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058" dependencies = [ "equivalent", - "hashbrown 0.15.2", + "hashbrown", ] +[[package]] +name = "indoc" +version = "2.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd" + [[package]] name = "ipnet" version = "2.11.0" @@ -1459,7 +1443,7 @@ dependencies = [ [[package]] name = "k8s-version" version = "0.1.3" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.93.2#e0309b9f85413846984ff16f6e522d0f720dee43" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=feature%2Fcluster-detection-local-kubelet#191c68a277bba250d6a150fa36b796555e8fd8cc" dependencies = [ "darling", "regex", @@ -1469,9 +1453,9 @@ dependencies = [ [[package]] name = "kube" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b49c39074089233c2bb7b1791d1b6c06c84dbab26757491fad9d233db0d432f" +checksum = "778f98664beaf4c3c11372721e14310d1ae00f5e2d9aabcf8906c881aa4e9f51" dependencies = [ "k8s-openapi", "kube-client", @@ -1482,9 +1466,9 @@ dependencies = [ [[package]] name = "kube-client" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e199797b1b08865041c9c698f0d11a91de0a8143e808b71e250cd4a1d7ce2b9f" +checksum = "7cb276b85b6e94ded00ac8ea2c68fcf4697ea0553cb25fddc35d4a0ab718db8d" dependencies = [ "base64 0.22.1", "bytes", @@ -1512,16 +1496,16 @@ dependencies = [ "thiserror 2.0.12", "tokio", "tokio-util", - "tower 0.5.2", + "tower", "tower-http", "tracing", ] [[package]] name = "kube-core" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bdefbba89dea2d99ea822a1d7cd6945535efbfb10b790056ee9284bf9e698e7" +checksum = "e3c56ff45deb0031f2a476017eed60c06872251f271b8387ad8020b8fef60960" dependencies = [ "chrono", "derive_more", @@ -1538,9 +1522,9 @@ dependencies = [ [[package]] name = "kube-derive" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e609a3633689a50869352a3c16e01d863b6137863c80eeb038383d5ab9f83bf" +checksum = "079fc8c1c397538628309cfdee20696ebdcc26745f9fb17f89b78782205bd995" dependencies = [ "darling", "proc-macro2", @@ -1552,9 +1536,9 @@ dependencies = [ [[package]] name = "kube-runtime" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d4bd8a4554786f8f9a87bfa977fb7dbaa1d7f102a30477338b044b65de29d8e" +checksum = "2f1326e946fadf6248febdf8a1c001809c3899ccf48cb9768cbc536b741040dc" dependencies = [ "ahash", "async-broadcast", @@ -1562,7 +1546,7 @@ dependencies = [ "backon", "educe", "futures", - "hashbrown 0.15.2", + "hashbrown", "hostname", "json-patch", "k8s-openapi", @@ -1742,9 +1726,9 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" [[package]] name = "opentelemetry" -version = "0.29.1" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e87237e2775f74896f9ad219d26a2081751187eb7c9f5c58dde20a23b95d16c" +checksum = "aaf416e4cb72756655126f7dd7bb0af49c674f4c1b9903e80c009e0c37e552e6" dependencies = [ "futures-core", "futures-sink", @@ -1756,9 +1740,9 @@ dependencies = [ [[package]] name = "opentelemetry-appender-tracing" -version = "0.29.1" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e716f864eb23007bdd9dc4aec381e188a1cee28eecf22066772b5fd822b9727d" +checksum = "e68f63eca5fad47e570e00e893094fc17be959c80c79a7d6ec1abdd5ae6ffc16" dependencies = [ "opentelemetry", "tracing", @@ -1768,25 +1752,23 @@ dependencies = [ [[package]] name = "opentelemetry-http" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46d7ab32b827b5b495bd90fa95a6cb65ccc293555dcc3199ae2937d2d237c8ed" +checksum = "50f6639e842a97dbea8886e3439710ae463120091e2e064518ba8e716e6ac36d" dependencies = [ "async-trait", "bytes", "http", "opentelemetry", "reqwest", - "tracing", ] [[package]] name = "opentelemetry-otlp" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d899720fe06916ccba71c01d04ecd77312734e2de3467fd30d9d580c8ce85656" +checksum = "dbee664a43e07615731afc539ca60c6d9f1a9425e25ca09c57bc36c87c55852b" dependencies = [ - "futures-core", "http", "opentelemetry", "opentelemetry-http", @@ -1796,40 +1778,44 @@ dependencies = [ "reqwest", "thiserror 2.0.12", "tokio", - "tonic 0.12.3", + "tonic", "tracing", ] [[package]] name = "opentelemetry-proto" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c40da242381435e18570d5b9d50aca2a4f4f4d8e146231adb4e7768023309b3" +checksum = "2e046fd7660710fe5a05e8748e70d9058dc15c94ba914e7c4faa7c728f0e8ddc" dependencies = [ "opentelemetry", "opentelemetry_sdk", "prost", - "tonic 0.12.3", + "tonic", ] +[[package]] +name = "opentelemetry-semantic-conventions" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83d059a296a47436748557a353c5e6c5705b9470ef6c95cfc52c21a8814ddac2" + [[package]] name = "opentelemetry_sdk" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afdefb21d1d47394abc1ba6c57363ab141be19e27cc70d0e422b7f303e4d290b" +checksum = "11f644aa9e5e31d11896e024305d7e3c98a88884d9f8919dbf37a9991bc47a4b" dependencies = [ "futures-channel", "futures-executor", "futures-util", - "glob", "opentelemetry", "percent-encoding", - "rand 0.9.1", + "rand", "serde_json", "thiserror 2.0.12", "tokio", "tokio-stream", - "tracing", ] [[package]] @@ -1944,7 +1930,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772" dependencies = [ "fixedbitset", - "indexmap 2.8.0", + "indexmap", ] [[package]] @@ -2102,35 +2088,14 @@ version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - [[package]] name = "rand" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97" dependencies = [ - "rand_chacha 0.9.0", - "rand_core 0.9.3", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", + "rand_chacha", + "rand_core", ] [[package]] @@ -2140,16 +2105,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" dependencies = [ "ppv-lite86", - "rand_core 0.9.3", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.15", + "rand_core", ] [[package]] @@ -2242,7 +2198,7 @@ dependencies = [ "serde_urlencoded", "sync_wrapper", "tokio", - "tower 0.5.2", + "tower", "tower-service", "url", "wasm-bindgen", @@ -2543,7 +2499,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.8.0", + "indexmap", "itoa", "ryu", "serde", @@ -2690,7 +2646,7 @@ dependencies = [ "strum", "tokio", "tokio-stream", - "tonic 0.13.1", + "tonic", "tonic-reflection", "tracing", ] @@ -2714,7 +2670,7 @@ dependencies = [ [[package]] name = "stackable-operator" version = "0.93.2" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.93.2#e0309b9f85413846984ff16f6e522d0f720dee43" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=feature%2Fcluster-detection-local-kubelet#191c68a277bba250d6a150fa36b796555e8fd8cc" dependencies = [ "chrono", "clap", @@ -2724,7 +2680,8 @@ dependencies = [ "educe", "either", "futures", - "indexmap 2.8.0", + "http", + "indexmap", "json-patch", "k8s-openapi", "kube", @@ -2751,7 +2708,7 @@ dependencies = [ [[package]] name = "stackable-operator-derive" version = "0.3.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.93.2#e0309b9f85413846984ff16f6e522d0f720dee43" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=feature%2Fcluster-detection-local-kubelet#191c68a277bba250d6a150fa36b796555e8fd8cc" dependencies = [ "darling", "proc-macro2", @@ -2762,7 +2719,7 @@ dependencies = [ [[package]] name = "stackable-shared" version = "0.0.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.93.2#e0309b9f85413846984ff16f6e522d0f720dee43" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=feature%2Fcluster-detection-local-kubelet#191c68a277bba250d6a150fa36b796555e8fd8cc" dependencies = [ "kube", "semver", @@ -2774,7 +2731,7 @@ dependencies = [ [[package]] name = "stackable-telemetry" version = "0.6.0" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.93.2#e0309b9f85413846984ff16f6e522d0f720dee43" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=feature%2Fcluster-detection-local-kubelet#191c68a277bba250d6a150fa36b796555e8fd8cc" dependencies = [ "axum", "clap", @@ -2782,12 +2739,13 @@ dependencies = [ "opentelemetry", "opentelemetry-appender-tracing", "opentelemetry-otlp", + "opentelemetry-semantic-conventions", "opentelemetry_sdk", "pin-project", "snafu 0.8.5", "strum", "tokio", - "tower 0.5.2", + "tower", "tracing", "tracing-appender", "tracing-opentelemetry", @@ -2797,23 +2755,25 @@ dependencies = [ [[package]] name = "stackable-versioned" version = "0.7.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.93.2#e0309b9f85413846984ff16f6e522d0f720dee43" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=feature%2Fcluster-detection-local-kubelet#191c68a277bba250d6a150fa36b796555e8fd8cc" dependencies = [ "k8s-version", "schemars", "serde", "serde_json", "serde_yaml", + "snafu 0.8.5", "stackable-versioned-macros", ] [[package]] name = "stackable-versioned-macros" version = "0.7.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.93.2#e0309b9f85413846984ff16f6e522d0f720dee43" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=feature%2Fcluster-detection-local-kubelet#191c68a277bba250d6a150fa36b796555e8fd8cc" dependencies = [ "convert_case", "darling", + "indoc", "itertools", "k8s-openapi", "k8s-version", @@ -3067,33 +3027,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tonic" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" -dependencies = [ - "async-trait", - "base64 0.22.1", - "bytes", - "flate2", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-timeout", - "hyper-util", - "percent-encoding", - "pin-project", - "prost", - "tokio", - "tokio-stream", - "tower 0.4.13", - "tower-layer", - "tower-service", - "tracing", -] - [[package]] name = "tonic" version = "0.13.1" @@ -3104,6 +3037,7 @@ dependencies = [ "axum", "base64 0.22.1", "bytes", + "flate2", "h2", "http", "http-body", @@ -3117,7 +3051,7 @@ dependencies = [ "socket2", "tokio", "tokio-stream", - "tower 0.5.2", + "tower", "tower-layer", "tower-service", "tracing", @@ -3147,27 +3081,7 @@ dependencies = [ "prost-types", "tokio", "tokio-stream", - "tonic 0.13.1", -] - -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "indexmap 1.9.3", - "pin-project", - "pin-project-lite", - "rand 0.8.5", - "slab", - "tokio", - "tokio-util", - "tower-layer", - "tower-service", - "tracing", + "tonic", ] [[package]] @@ -3178,7 +3092,7 @@ checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" dependencies = [ "futures-core", "futures-util", - "indexmap 2.8.0", + "indexmap", "pin-project-lite", "slab", "sync_wrapper", @@ -3277,9 +3191,9 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd8e764bd6f5813fd8bebc3117875190c5b0415be8f7f8059bffb6ecd979c444" +checksum = "ddcf5959f39507d0d04d6413119c04f33b623f4f951ebcbdddddfad2d0623a9c" dependencies = [ "js-sys", "once_cell", diff --git a/Cargo.nix b/Cargo.nix index 99892c9b..bf6f8e11 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -633,7 +633,7 @@ rec { } { name = "tower"; - packageId = "tower 0.5.2"; + packageId = "tower"; usesDefaultFeatures = false; features = [ "util" ]; } @@ -676,7 +676,7 @@ rec { } { name = "tower"; - packageId = "tower 0.5.2"; + packageId = "tower"; rename = "tower"; features = [ "util" "timeout" "limit" "load-shed" "steer" "filter" ]; } @@ -1594,7 +1594,7 @@ rec { } { name = "tonic"; - packageId = "tonic 0.13.1"; + packageId = "tonic"; } ]; buildDependencies = [ @@ -2718,7 +2718,6 @@ rec { "rustc-dep-of-std" = [ "compiler_builtins" "core" "libc/rustc-dep-of-std" "wasi/rustc-dep-of-std" ]; "wasm-bindgen" = [ "dep:wasm-bindgen" ]; }; - resolvedDefaultFeatures = [ "std" ]; }; "getrandom 0.3.2" = rec { crateName = "getrandom"; @@ -2859,16 +2858,6 @@ rec { "zlib-ng-compat" = [ "libgit2-sys/zlib-ng-compat" ]; }; }; - "glob" = rec { - crateName = "glob"; - version = "0.3.2"; - edition = "2015"; - sha256 = "1cm2w34b5w45fxr522h5b0fv1bxchfswcj560m3pnjbia7asvld8"; - authors = [ - "The Rust Project Developers" - ]; - - }; "gloo-timers" = rec { crateName = "gloo-timers"; version = "0.3.0"; @@ -2943,7 +2932,7 @@ rec { } { name = "indexmap"; - packageId = "indexmap 2.8.0"; + packageId = "indexmap"; features = [ "std" ]; } { @@ -2977,29 +2966,7 @@ rec { features = { }; }; - "hashbrown 0.12.3" = rec { - crateName = "hashbrown"; - version = "0.12.3"; - edition = "2021"; - sha256 = "1268ka4750pyg2pbgsr43f0289l5zah4arir2k4igx5a8c6fg7la"; - authors = [ - "Amanieu d'Antras " - ]; - features = { - "ahash" = [ "dep:ahash" ]; - "ahash-compile-time-rng" = [ "ahash/compile-time-rng" ]; - "alloc" = [ "dep:alloc" ]; - "bumpalo" = [ "dep:bumpalo" ]; - "compiler_builtins" = [ "dep:compiler_builtins" ]; - "core" = [ "dep:core" ]; - "default" = [ "ahash" "inline-more" ]; - "rayon" = [ "dep:rayon" ]; - "rustc-dep-of-std" = [ "nightly" "core" "compiler_builtins" "alloc" "rustc-internal-api" ]; - "serde" = [ "dep:serde" ]; - }; - resolvedDefaultFeatures = [ "raw" ]; - }; - "hashbrown 0.15.2" = rec { + "hashbrown" = rec { crateName = "hashbrown"; version = "0.15.2"; edition = "2021"; @@ -4261,35 +4228,7 @@ rec { }; resolvedDefaultFeatures = [ "compiled_data" ]; }; - "indexmap 1.9.3" = rec { - crateName = "indexmap"; - version = "1.9.3"; - edition = "2021"; - sha256 = "16dxmy7yvk51wvnih3a3im6fp5lmx0wx76i03n06wyak6cwhw1xx"; - dependencies = [ - { - name = "hashbrown"; - packageId = "hashbrown 0.12.3"; - usesDefaultFeatures = false; - features = [ "raw" ]; - } - ]; - buildDependencies = [ - { - name = "autocfg"; - packageId = "autocfg"; - } - ]; - features = { - "arbitrary" = [ "dep:arbitrary" ]; - "quickcheck" = [ "dep:quickcheck" ]; - "rayon" = [ "dep:rayon" ]; - "rustc-rayon" = [ "dep:rustc-rayon" ]; - "serde" = [ "dep:serde" ]; - "serde-1" = [ "serde" ]; - }; - }; - "indexmap 2.8.0" = rec { + "indexmap" = rec { crateName = "indexmap"; version = "2.8.0"; edition = "2021"; @@ -4302,7 +4241,7 @@ rec { } { name = "hashbrown"; - packageId = "hashbrown 0.15.2"; + packageId = "hashbrown"; usesDefaultFeatures = false; } ]; @@ -4316,6 +4255,17 @@ rec { }; resolvedDefaultFeatures = [ "default" "std" ]; }; + "indoc" = rec { + crateName = "indoc"; + version = "2.0.6"; + edition = "2021"; + sha256 = "1gbn2pkx5sgbd9lp05d2bkqpbfgazi0z3nvharh5ajah11d29izl"; + procMacro = true; + authors = [ + "David Tolnay " + ]; + + }; "ipnet" = rec { crateName = "ipnet"; version = "2.11.0"; @@ -4610,9 +4560,9 @@ rec { edition = "2024"; workspace_member = null; src = pkgs.fetchgit { - url = "https://github.com/stackabletech/operator-rs.git"; - rev = "e0309b9f85413846984ff16f6e522d0f720dee43"; - sha256 = "0604b0vvlzhh7a6pmcnm6k72pnkcv3f171n9981vj06wsbj9j98r"; + url = "https://github.com/stackabletech//operator-rs.git"; + rev = "191c68a277bba250d6a150fa36b796555e8fd8cc"; + sha256 = "1n37g6byyi9kkhrsw6g3dy0b5l5xidn7q3h2ypj92qcagz6vgs43"; }; libName = "k8s_version"; authors = [ @@ -4647,9 +4597,9 @@ rec { }; "kube" = rec { crateName = "kube"; - version = "1.0.0"; + version = "1.1.0"; edition = "2021"; - sha256 = "0bs31pdk7lnrza8p8x96mgdq8v60nv8r25vvpg1374h8fj8c6j8v"; + sha256 = "0lcz9sm83j06i77sp6idbq7y06hd64a1wwkj2g0w7x7a9dk9i3vp"; authors = [ "clux " "Natalie Klestrup Röijezon " @@ -4720,9 +4670,9 @@ rec { }; "kube-client" = rec { crateName = "kube-client"; - version = "1.0.0"; + version = "1.1.0"; edition = "2021"; - sha256 = "17rbrvbs3m0c4lgbf2788f0hmpli3b8z1666r50m11h83dxpk6g1"; + sha256 = "13fv32vhljjxqgfmzciwanh7wsglzil2rsn81b8dx53fbfw7dckw"; libName = "kube_client"; authors = [ "clux " @@ -4868,7 +4818,7 @@ rec { } { name = "tower"; - packageId = "tower 0.5.2"; + packageId = "tower"; optional = true; features = [ "buffer" "filter" "util" ]; } @@ -4961,9 +4911,9 @@ rec { }; "kube-core" = rec { crateName = "kube-core"; - version = "1.0.0"; + version = "1.1.0"; edition = "2021"; - sha256 = "1rwqwvwlna79dq2r1dqhzgxmwls5d76xg892m2gdk8nyi6xgpphv"; + sha256 = "0q09yvzbh840mn3q66r73wjp4s60c3npw0bnlkr3207bbps6zig3"; libName = "kube_core"; authors = [ "clux " @@ -5043,9 +4993,9 @@ rec { }; "kube-derive" = rec { crateName = "kube-derive"; - version = "1.0.0"; + version = "1.1.0"; edition = "2021"; - sha256 = "1gw3kymxb0w30gmhxj33g09vcqyq05pc38sjjf3516k86cv9lq4f"; + sha256 = "15frbch851xpi5zv37szfhkcrgbfd4hfxzcw60l8clwpqg0wi7q7"; procMacro = true; libName = "kube_derive"; authors = [ @@ -5092,9 +5042,9 @@ rec { }; "kube-runtime" = rec { crateName = "kube-runtime"; - version = "1.0.0"; + version = "1.1.0"; edition = "2021"; - sha256 = "13lxw9fvci5h71rlfc1a21zivanvnxzrgykvm3wzi1j7anjdhjqx"; + sha256 = "1p2021s6nlxwiivbk37lrjcki740070a3y5xzr465pzs8vljc4rg"; libName = "kube_runtime"; authors = [ "clux " @@ -5132,7 +5082,7 @@ rec { } { name = "hashbrown"; - packageId = "hashbrown 0.15.2"; + packageId = "hashbrown"; } { name = "hostname"; @@ -5681,9 +5631,9 @@ rec { }; "opentelemetry" = rec { crateName = "opentelemetry"; - version = "0.29.1"; + version = "0.30.0"; edition = "2021"; - sha256 = "0v6ijlxs486yip2zbjdpgqc525q8l8k9s8ddz6b4ixvm4xz271wy"; + sha256 = "1rjjwlvhr7h01kl0768v9i7ng77l1axxfzbg29ancxbjrgj1dx5a"; dependencies = [ { name = "futures-core"; @@ -5735,9 +5685,9 @@ rec { }; "opentelemetry-appender-tracing" = rec { crateName = "opentelemetry-appender-tracing"; - version = "0.29.1"; + version = "0.30.1"; edition = "2021"; - sha256 = "0zbjp4idhprbfxk21wpcivicx8c8w60w7bn4kpfpn013xdjgh5p7"; + sha256 = "05pwdypdbg8sxkbafy8cr1cyjyy19w4r7s001rbpxm7slpn673z6"; libName = "opentelemetry_appender_tracing"; dependencies = [ { @@ -5788,9 +5738,9 @@ rec { }; "opentelemetry-http" = rec { crateName = "opentelemetry-http"; - version = "0.29.0"; + version = "0.30.0"; edition = "2021"; - sha256 = "1vf86z9d4dr9msck3k2xan9w5k35rfk9bylhpnav9d97p0rapms6"; + sha256 = "0vf3d9p733ms312hcbhy14h32imf22bl7qw6i3mdp5rahjg67xjh"; libName = "opentelemetry_http"; dependencies = [ { @@ -5819,35 +5769,24 @@ rec { usesDefaultFeatures = false; features = [ "blocking" ]; } - { - name = "tracing"; - packageId = "tracing"; - optional = true; - usesDefaultFeatures = false; - } ]; features = { "default" = [ "internal-logs" ]; "hyper" = [ "dep:http-body-util" "dep:hyper" "dep:hyper-util" "dep:tokio" ]; - "internal-logs" = [ "tracing" "opentelemetry/internal-logs" ]; + "internal-logs" = [ "opentelemetry/internal-logs" ]; "reqwest" = [ "dep:reqwest" ]; "reqwest-rustls" = [ "reqwest" "reqwest/rustls-tls-native-roots" ]; "reqwest-rustls-webpki-roots" = [ "reqwest" "reqwest/rustls-tls-webpki-roots" ]; - "tracing" = [ "dep:tracing" ]; }; - resolvedDefaultFeatures = [ "default" "internal-logs" "reqwest" "tracing" ]; + resolvedDefaultFeatures = [ "default" "internal-logs" "reqwest" ]; }; "opentelemetry-otlp" = rec { crateName = "opentelemetry-otlp"; - version = "0.29.0"; + version = "0.30.0"; edition = "2021"; - sha256 = "0mjnx260qn4x1p9pyip35m7764kkszn087f0f6xcq5k9w07p56fq"; + sha256 = "0aw5amychdmwayfa0p724na1m7vd1jk9qlzw39riaxp08d56dvnv"; libName = "opentelemetry_otlp"; dependencies = [ - { - name = "futures-core"; - packageId = "futures-core"; - } { name = "http"; packageId = "http"; @@ -5900,7 +5839,7 @@ rec { } { name = "tonic"; - packageId = "tonic 0.12.3"; + packageId = "tonic"; optional = true; usesDefaultFeatures = false; } @@ -5920,9 +5859,9 @@ rec { } { name = "tonic"; - packageId = "tonic 0.12.3"; + packageId = "tonic"; usesDefaultFeatures = false; - features = [ "server" ]; + features = [ "router" "server" ]; } ]; features = { @@ -5947,8 +5886,8 @@ rec { "serde" = [ "dep:serde" ]; "serde_json" = [ "dep:serde_json" ]; "serialize" = [ "serde" "serde_json" ]; - "tls" = [ "tonic/tls" ]; - "tls-roots" = [ "tls" "tonic/tls-roots" ]; + "tls" = [ "tonic/tls-ring" ]; + "tls-roots" = [ "tls" "tonic/tls-native-roots" ]; "tls-webpki-roots" = [ "tls" "tonic/tls-webpki-roots" ]; "tokio" = [ "dep:tokio" ]; "tonic" = [ "dep:tonic" ]; @@ -5960,9 +5899,9 @@ rec { }; "opentelemetry-proto" = rec { crateName = "opentelemetry-proto"; - version = "0.29.0"; + version = "0.30.0"; edition = "2021"; - sha256 = "1cq96c16hxsfvcd26ip1v3sg9952mi89snqdawc5whw14cjdlh4c"; + sha256 = "1p4d1s7p4z5a9xy4x4dsjifc3385v5q8wx780mdgw407cvbny11f"; libName = "opentelemetry_proto"; dependencies = [ { @@ -5982,7 +5921,7 @@ rec { } { name = "tonic"; - packageId = "tonic 0.12.3"; + packageId = "tonic"; optional = true; usesDefaultFeatures = false; features = [ "codegen" "prost" ]; @@ -5995,7 +5934,7 @@ rec { "gen-tonic" = [ "gen-tonic-messages" "tonic/channel" ]; "gen-tonic-messages" = [ "tonic" "prost" ]; "hex" = [ "dep:hex" ]; - "internal-logs" = [ "tracing" ]; + "internal-logs" = [ "opentelemetry/internal-logs" ]; "logs" = [ "opentelemetry/logs" "opentelemetry_sdk/logs" ]; "metrics" = [ "opentelemetry/metrics" "opentelemetry_sdk/metrics" ]; "prost" = [ "dep:prost" ]; @@ -6004,18 +5943,27 @@ rec { "testing" = [ "opentelemetry/testing" ]; "tonic" = [ "dep:tonic" ]; "trace" = [ "opentelemetry/trace" "opentelemetry_sdk/trace" ]; - "tracing" = [ "dep:tracing" ]; "with-schemars" = [ "schemars" ]; "with-serde" = [ "serde" "hex" "base64" ]; "zpages" = [ "trace" ]; }; resolvedDefaultFeatures = [ "gen-tonic" "gen-tonic-messages" "logs" "metrics" "prost" "tonic" "trace" ]; }; + "opentelemetry-semantic-conventions" = rec { + crateName = "opentelemetry-semantic-conventions"; + version = "0.30.0"; + edition = "2021"; + sha256 = "1hns9n0sh89cqp7rav7gf2a5nw65wv2m78sphms3cx54jsi5kl43"; + libName = "opentelemetry_semantic_conventions"; + features = { + }; + resolvedDefaultFeatures = [ "default" ]; + }; "opentelemetry_sdk" = rec { crateName = "opentelemetry_sdk"; - version = "0.29.0"; + version = "0.30.0"; edition = "2021"; - sha256 = "02r99lz30zrb8870vivww8cvwhdi78v5fv5sq6mr8wyls4hzppmg"; + sha256 = "0jvsqhdrka9ppyfr3y6rhj4ai61wgrfk0970jqcd2cayksm49xhi"; dependencies = [ { name = "futures-channel"; @@ -6031,11 +5979,6 @@ rec { usesDefaultFeatures = false; features = [ "std" "sink" "async-await-macro" ]; } - { - name = "glob"; - packageId = "glob"; - optional = true; - } { name = "opentelemetry"; packageId = "opentelemetry"; @@ -6047,7 +5990,7 @@ rec { } { name = "rand"; - packageId = "rand 0.9.1"; + packageId = "rand"; optional = true; usesDefaultFeatures = false; features = [ "std" "std_rng" "small_rng" "os_rng" "thread_rng" ]; @@ -6074,26 +6017,20 @@ rec { packageId = "tokio-stream"; optional = true; } - { - name = "tracing"; - packageId = "tracing"; - optional = true; - usesDefaultFeatures = false; - } ]; features = { "default" = [ "trace" "metrics" "logs" "internal-logs" ]; - "experimental_logs_batch_log_processor_with_async_runtime" = [ "logs" ]; + "experimental_logs_batch_log_processor_with_async_runtime" = [ "logs" "experimental_async_runtime" ]; "experimental_logs_concurrent_log_processor" = [ "logs" ]; + "experimental_metrics_custom_reader" = [ "metrics" ]; "experimental_metrics_disable_name_validation" = [ "metrics" ]; - "experimental_metrics_periodicreader_with_async_runtime" = [ "metrics" ]; - "experimental_trace_batch_span_processor_with_async_runtime" = [ "trace" ]; - "glob" = [ "dep:glob" ]; + "experimental_metrics_periodicreader_with_async_runtime" = [ "metrics" "experimental_async_runtime" ]; + "experimental_trace_batch_span_processor_with_async_runtime" = [ "trace" "experimental_async_runtime" ]; "http" = [ "dep:http" ]; - "internal-logs" = [ "tracing" ]; - "jaeger_remote_sampler" = [ "trace" "opentelemetry-http" "http" "serde" "serde_json" "url" ]; + "internal-logs" = [ "opentelemetry/internal-logs" ]; + "jaeger_remote_sampler" = [ "trace" "opentelemetry-http" "http" "serde" "serde_json" "url" "experimental_async_runtime" ]; "logs" = [ "opentelemetry/logs" "serde_json" ]; - "metrics" = [ "opentelemetry/metrics" "glob" ]; + "metrics" = [ "opentelemetry/metrics" ]; "opentelemetry-http" = [ "dep:opentelemetry-http" ]; "percent-encoding" = [ "dep:percent-encoding" ]; "rand" = [ "dep:rand" ]; @@ -6107,10 +6044,9 @@ rec { "tokio" = [ "dep:tokio" ]; "tokio-stream" = [ "dep:tokio-stream" ]; "trace" = [ "opentelemetry/trace" "rand" "percent-encoding" ]; - "tracing" = [ "dep:tracing" ]; "url" = [ "dep:url" ]; }; - resolvedDefaultFeatures = [ "default" "experimental_async_runtime" "glob" "internal-logs" "logs" "metrics" "percent-encoding" "rand" "rt-tokio" "serde_json" "spec_unstable_logs_enabled" "tokio" "tokio-stream" "trace" "tracing" ]; + resolvedDefaultFeatures = [ "default" "experimental_async_runtime" "internal-logs" "logs" "metrics" "percent-encoding" "rand" "rt-tokio" "serde_json" "spec_unstable_logs_enabled" "tokio" "tokio-stream" "trace" ]; }; "ordered-float" = rec { crateName = "ordered-float"; @@ -6425,7 +6361,7 @@ rec { } { name = "indexmap"; - packageId = "indexmap 2.8.0"; + packageId = "indexmap"; } ]; features = { @@ -6867,51 +6803,7 @@ rec { "rustc-dep-of-std" = [ "compiler_builtins/rustc-dep-of-std" "core" ]; }; }; - "rand 0.8.5" = rec { - crateName = "rand"; - version = "0.8.5"; - edition = "2018"; - sha256 = "013l6931nn7gkc23jz5mm3qdhf93jjf0fg64nz2lp4i51qd8vbrl"; - authors = [ - "The Rand Project Developers" - "The Rust Project Developers" - ]; - dependencies = [ - { - name = "libc"; - packageId = "libc"; - optional = true; - usesDefaultFeatures = false; - target = { target, features }: (target."unix" or false); - } - { - name = "rand_chacha"; - packageId = "rand_chacha 0.3.1"; - optional = true; - usesDefaultFeatures = false; - } - { - name = "rand_core"; - packageId = "rand_core 0.6.4"; - } - ]; - features = { - "alloc" = [ "rand_core/alloc" ]; - "default" = [ "std" "std_rng" ]; - "getrandom" = [ "rand_core/getrandom" ]; - "libc" = [ "dep:libc" ]; - "log" = [ "dep:log" ]; - "packed_simd" = [ "dep:packed_simd" ]; - "rand_chacha" = [ "dep:rand_chacha" ]; - "serde" = [ "dep:serde" ]; - "serde1" = [ "serde" "rand_core/serde1" ]; - "simd_support" = [ "packed_simd" ]; - "std" = [ "rand_core/std" "rand_chacha/std" "alloc" "getrandom" "libc" ]; - "std_rng" = [ "rand_chacha" ]; - }; - resolvedDefaultFeatures = [ "alloc" "default" "getrandom" "libc" "rand_chacha" "small_rng" "std" "std_rng" ]; - }; - "rand 0.9.1" = rec { + "rand" = rec { crateName = "rand"; version = "0.9.1"; edition = "2021"; @@ -6923,13 +6815,13 @@ rec { dependencies = [ { name = "rand_chacha"; - packageId = "rand_chacha 0.9.0"; + packageId = "rand_chacha"; optional = true; usesDefaultFeatures = false; } { name = "rand_core"; - packageId = "rand_core 0.9.3"; + packageId = "rand_core"; usesDefaultFeatures = false; } ]; @@ -6944,37 +6836,7 @@ rec { }; resolvedDefaultFeatures = [ "alloc" "os_rng" "small_rng" "std" "std_rng" "thread_rng" ]; }; - "rand_chacha 0.3.1" = rec { - crateName = "rand_chacha"; - version = "0.3.1"; - edition = "2018"; - sha256 = "123x2adin558xbhvqb8w4f6syjsdkmqff8cxwhmjacpsl1ihmhg6"; - authors = [ - "The Rand Project Developers" - "The Rust Project Developers" - "The CryptoCorrosion Contributors" - ]; - dependencies = [ - { - name = "ppv-lite86"; - packageId = "ppv-lite86"; - usesDefaultFeatures = false; - features = [ "simd" ]; - } - { - name = "rand_core"; - packageId = "rand_core 0.6.4"; - } - ]; - features = { - "default" = [ "std" ]; - "serde" = [ "dep:serde" ]; - "serde1" = [ "serde" ]; - "std" = [ "ppv-lite86/std" ]; - }; - resolvedDefaultFeatures = [ "std" ]; - }; - "rand_chacha 0.9.0" = rec { + "rand_chacha" = rec { crateName = "rand_chacha"; version = "0.9.0"; edition = "2021"; @@ -6993,13 +6855,13 @@ rec { } { name = "rand_core"; - packageId = "rand_core 0.9.3"; + packageId = "rand_core"; } ]; devDependencies = [ { name = "rand_core"; - packageId = "rand_core 0.9.3"; + packageId = "rand_core"; features = [ "os_rng" ]; } ]; @@ -7011,31 +6873,7 @@ rec { }; resolvedDefaultFeatures = [ "std" ]; }; - "rand_core 0.6.4" = rec { - crateName = "rand_core"; - version = "0.6.4"; - edition = "2018"; - sha256 = "0b4j2v4cb5krak1pv6kakv4sz6xcwbrmy2zckc32hsigbrwy82zc"; - authors = [ - "The Rand Project Developers" - "The Rust Project Developers" - ]; - dependencies = [ - { - name = "getrandom"; - packageId = "getrandom 0.2.15"; - optional = true; - } - ]; - features = { - "getrandom" = [ "dep:getrandom" ]; - "serde" = [ "dep:serde" ]; - "serde1" = [ "serde" ]; - "std" = [ "alloc" "getrandom" "getrandom/std" ]; - }; - resolvedDefaultFeatures = [ "alloc" "getrandom" "std" ]; - }; - "rand_core 0.9.3" = rec { + "rand_core" = rec { crateName = "rand_core"; version = "0.9.3"; edition = "2021"; @@ -7382,7 +7220,7 @@ rec { } { name = "tower"; - packageId = "tower 0.5.2"; + packageId = "tower"; usesDefaultFeatures = false; target = { target, features }: (!("wasm32" == target."arch" or null)); features = [ "timeout" "util" ]; @@ -7453,7 +7291,7 @@ rec { } { name = "tower"; - packageId = "tower 0.5.2"; + packageId = "tower"; usesDefaultFeatures = false; features = [ "limit" ]; } @@ -8439,7 +8277,7 @@ rec { dependencies = [ { name = "indexmap"; - packageId = "indexmap 2.8.0"; + packageId = "indexmap"; } { name = "itoa"; @@ -8884,7 +8722,7 @@ rec { } { name = "tonic"; - packageId = "tonic 0.13.1"; + packageId = "tonic"; } { name = "tonic-reflection"; @@ -8974,9 +8812,9 @@ rec { edition = "2024"; workspace_member = null; src = pkgs.fetchgit { - url = "https://github.com/stackabletech/operator-rs.git"; - rev = "e0309b9f85413846984ff16f6e522d0f720dee43"; - sha256 = "0604b0vvlzhh7a6pmcnm6k72pnkcv3f171n9981vj06wsbj9j98r"; + url = "https://github.com/stackabletech//operator-rs.git"; + rev = "191c68a277bba250d6a150fa36b796555e8fd8cc"; + sha256 = "1n37g6byyi9kkhrsw6g3dy0b5l5xidn7q3h2ypj92qcagz6vgs43"; }; libName = "stackable_operator"; authors = [ @@ -9019,9 +8857,13 @@ rec { name = "futures"; packageId = "futures"; } + { + name = "http"; + packageId = "http"; + } { name = "indexmap"; - packageId = "indexmap 2.8.0"; + packageId = "indexmap"; } { name = "json-patch"; @@ -9133,9 +8975,9 @@ rec { edition = "2024"; workspace_member = null; src = pkgs.fetchgit { - url = "https://github.com/stackabletech/operator-rs.git"; - rev = "e0309b9f85413846984ff16f6e522d0f720dee43"; - sha256 = "0604b0vvlzhh7a6pmcnm6k72pnkcv3f171n9981vj06wsbj9j98r"; + url = "https://github.com/stackabletech//operator-rs.git"; + rev = "191c68a277bba250d6a150fa36b796555e8fd8cc"; + sha256 = "1n37g6byyi9kkhrsw6g3dy0b5l5xidn7q3h2ypj92qcagz6vgs43"; }; procMacro = true; libName = "stackable_operator_derive"; @@ -9168,9 +9010,9 @@ rec { edition = "2024"; workspace_member = null; src = pkgs.fetchgit { - url = "https://github.com/stackabletech/operator-rs.git"; - rev = "e0309b9f85413846984ff16f6e522d0f720dee43"; - sha256 = "0604b0vvlzhh7a6pmcnm6k72pnkcv3f171n9981vj06wsbj9j98r"; + url = "https://github.com/stackabletech//operator-rs.git"; + rev = "191c68a277bba250d6a150fa36b796555e8fd8cc"; + sha256 = "1n37g6byyi9kkhrsw6g3dy0b5l5xidn7q3h2ypj92qcagz6vgs43"; }; libName = "stackable_shared"; authors = [ @@ -9209,9 +9051,9 @@ rec { edition = "2024"; workspace_member = null; src = pkgs.fetchgit { - url = "https://github.com/stackabletech/operator-rs.git"; - rev = "e0309b9f85413846984ff16f6e522d0f720dee43"; - sha256 = "0604b0vvlzhh7a6pmcnm6k72pnkcv3f171n9981vj06wsbj9j98r"; + url = "https://github.com/stackabletech//operator-rs.git"; + rev = "191c68a277bba250d6a150fa36b796555e8fd8cc"; + sha256 = "1n37g6byyi9kkhrsw6g3dy0b5l5xidn7q3h2ypj92qcagz6vgs43"; }; libName = "stackable_telemetry"; authors = [ @@ -9247,6 +9089,10 @@ rec { packageId = "opentelemetry-otlp"; features = [ "grpc-tonic" "gzip-tonic" "logs" ]; } + { + name = "opentelemetry-semantic-conventions"; + packageId = "opentelemetry-semantic-conventions"; + } { name = "opentelemetry_sdk"; packageId = "opentelemetry_sdk"; @@ -9272,7 +9118,7 @@ rec { } { name = "tower"; - packageId = "tower 0.5.2"; + packageId = "tower"; features = [ "util" ]; } { @@ -9315,9 +9161,9 @@ rec { edition = "2024"; workspace_member = null; src = pkgs.fetchgit { - url = "https://github.com/stackabletech/operator-rs.git"; - rev = "e0309b9f85413846984ff16f6e522d0f720dee43"; - sha256 = "0604b0vvlzhh7a6pmcnm6k72pnkcv3f171n9981vj06wsbj9j98r"; + url = "https://github.com/stackabletech//operator-rs.git"; + rev = "191c68a277bba250d6a150fa36b796555e8fd8cc"; + sha256 = "1n37g6byyi9kkhrsw6g3dy0b5l5xidn7q3h2ypj92qcagz6vgs43"; }; libName = "stackable_versioned"; authors = [ @@ -9352,6 +9198,11 @@ rec { packageId = "serde_yaml"; optional = true; } + { + name = "snafu"; + packageId = "snafu 0.8.5"; + optional = true; + } { name = "stackable-versioned-macros"; packageId = "stackable-versioned-macros"; @@ -9359,7 +9210,7 @@ rec { ]; features = { "full" = [ "k8s" ]; - "k8s" = [ "stackable-versioned-macros/k8s" "dep:k8s-version" "dep:serde_json" "dep:serde_yaml" "dep:schemars" "dep:serde" ]; + "k8s" = [ "stackable-versioned-macros/k8s" "dep:k8s-version" "dep:schemars" "dep:serde_json" "dep:serde_yaml" "dep:serde" "dep:snafu" ]; }; resolvedDefaultFeatures = [ "k8s" ]; }; @@ -9369,9 +9220,9 @@ rec { edition = "2024"; workspace_member = null; src = pkgs.fetchgit { - url = "https://github.com/stackabletech/operator-rs.git"; - rev = "e0309b9f85413846984ff16f6e522d0f720dee43"; - sha256 = "0604b0vvlzhh7a6pmcnm6k72pnkcv3f171n9981vj06wsbj9j98r"; + url = "https://github.com/stackabletech//operator-rs.git"; + rev = "191c68a277bba250d6a150fa36b796555e8fd8cc"; + sha256 = "1n37g6byyi9kkhrsw6g3dy0b5l5xidn7q3h2ypj92qcagz6vgs43"; }; procMacro = true; libName = "stackable_versioned_macros"; @@ -9387,6 +9238,10 @@ rec { name = "darling"; packageId = "darling"; } + { + name = "indoc"; + packageId = "indoc"; + } { name = "itertools"; packageId = "itertools"; @@ -10204,137 +10059,7 @@ rec { }; resolvedDefaultFeatures = [ "codec" "default" "io" "slab" "time" ]; }; - "tonic 0.12.3" = rec { - crateName = "tonic"; - version = "0.12.3"; - edition = "2021"; - sha256 = "0ljd1lfjpw0vrm5wbv15x6nq2i38llsanls5rkzmdn2n0wrmnz47"; - authors = [ - "Lucio Franco " - ]; - dependencies = [ - { - name = "async-trait"; - packageId = "async-trait"; - optional = true; - } - { - name = "base64"; - packageId = "base64 0.22.1"; - } - { - name = "bytes"; - packageId = "bytes"; - } - { - name = "flate2"; - packageId = "flate2"; - optional = true; - } - { - name = "http"; - packageId = "http"; - } - { - name = "http-body"; - packageId = "http-body"; - } - { - name = "http-body-util"; - packageId = "http-body-util"; - } - { - name = "hyper"; - packageId = "hyper"; - optional = true; - features = [ "http1" "http2" ]; - } - { - name = "hyper-timeout"; - packageId = "hyper-timeout"; - optional = true; - } - { - name = "hyper-util"; - packageId = "hyper-util"; - optional = true; - features = [ "tokio" ]; - } - { - name = "percent-encoding"; - packageId = "percent-encoding"; - } - { - name = "pin-project"; - packageId = "pin-project"; - } - { - name = "prost"; - packageId = "prost"; - optional = true; - usesDefaultFeatures = false; - features = [ "std" ]; - } - { - name = "tokio"; - packageId = "tokio"; - optional = true; - usesDefaultFeatures = false; - } - { - name = "tokio-stream"; - packageId = "tokio-stream"; - usesDefaultFeatures = false; - } - { - name = "tower"; - packageId = "tower 0.4.13"; - optional = true; - usesDefaultFeatures = false; - } - { - name = "tower-layer"; - packageId = "tower-layer"; - } - { - name = "tower-service"; - packageId = "tower-service"; - } - { - name = "tracing"; - packageId = "tracing"; - } - ]; - devDependencies = [ - { - name = "tokio"; - packageId = "tokio"; - features = [ "rt" "macros" ]; - } - { - name = "tower"; - packageId = "tower 0.4.13"; - features = [ "full" ]; - } - ]; - features = { - "channel" = [ "dep:hyper" "hyper?/client" "dep:hyper-util" "hyper-util?/client-legacy" "dep:tower" "tower?/balance" "tower?/buffer" "tower?/discover" "tower?/limit" "tower?/util" "dep:tokio" "tokio?/time" "dep:hyper-timeout" ]; - "codegen" = [ "dep:async-trait" ]; - "default" = [ "transport" "codegen" "prost" ]; - "gzip" = [ "dep:flate2" ]; - "prost" = [ "dep:prost" ]; - "router" = [ "dep:axum" "dep:tower" "tower?/util" ]; - "server" = [ "router" "dep:async-stream" "dep:h2" "dep:hyper" "hyper?/server" "dep:hyper-util" "hyper-util?/service" "hyper-util?/server-auto" "dep:socket2" "dep:tokio" "tokio?/macros" "tokio?/net" "tokio?/time" "tokio-stream/net" "dep:tower" "tower?/util" "tower?/limit" ]; - "tls" = [ "dep:rustls-pemfile" "dep:tokio-rustls" "dep:tokio" "tokio?/rt" "tokio?/macros" ]; - "tls-native-roots" = [ "tls" "channel" "dep:rustls-native-certs" ]; - "tls-roots" = [ "tls-native-roots" ]; - "tls-webpki-roots" = [ "tls" "channel" "dep:webpki-roots" ]; - "transport" = [ "server" "channel" ]; - "zstd" = [ "dep:zstd" ]; - }; - resolvedDefaultFeatures = [ "channel" "codegen" "gzip" "prost" ]; - }; - "tonic 0.13.1" = rec { + "tonic" = rec { crateName = "tonic"; version = "0.13.1"; edition = "2021"; @@ -10362,6 +10087,11 @@ rec { name = "bytes"; packageId = "bytes"; } + { + name = "flate2"; + packageId = "flate2"; + optional = true; + } { name = "h2"; packageId = "h2"; @@ -10430,7 +10160,7 @@ rec { } { name = "tower"; - packageId = "tower 0.5.2"; + packageId = "tower"; optional = true; usesDefaultFeatures = false; } @@ -10455,7 +10185,7 @@ rec { } { name = "tower"; - packageId = "tower 0.5.2"; + packageId = "tower"; features = [ "full" ]; } ]; @@ -10476,7 +10206,7 @@ rec { "transport" = [ "server" "channel" ]; "zstd" = [ "dep:zstd" ]; }; - resolvedDefaultFeatures = [ "channel" "codegen" "default" "prost" "router" "server" "transport" ]; + resolvedDefaultFeatures = [ "channel" "codegen" "default" "gzip" "prost" "router" "server" "transport" ]; }; "tonic-build" = rec { crateName = "tonic-build"; @@ -10557,7 +10287,7 @@ rec { } { name = "tonic"; - packageId = "tonic 0.13.1"; + packageId = "tonic"; usesDefaultFeatures = false; features = [ "codegen" "prost" ]; } @@ -10571,7 +10301,7 @@ rec { } { name = "tonic"; - packageId = "tonic 0.13.1"; + packageId = "tonic"; usesDefaultFeatures = false; features = [ "transport" ]; } @@ -10582,128 +10312,7 @@ rec { }; resolvedDefaultFeatures = [ "default" "server" ]; }; - "tower 0.4.13" = rec { - crateName = "tower"; - version = "0.4.13"; - edition = "2018"; - sha256 = "073wncyqav4sak1p755hf6vl66njgfc1z1g1di9rxx3cvvh9pymq"; - authors = [ - "Tower Maintainers " - ]; - dependencies = [ - { - name = "futures-core"; - packageId = "futures-core"; - optional = true; - } - { - name = "futures-util"; - packageId = "futures-util"; - optional = true; - usesDefaultFeatures = false; - features = [ "alloc" ]; - } - { - name = "indexmap"; - packageId = "indexmap 1.9.3"; - optional = true; - } - { - name = "pin-project"; - packageId = "pin-project"; - optional = true; - } - { - name = "pin-project-lite"; - packageId = "pin-project-lite"; - optional = true; - } - { - name = "rand"; - packageId = "rand 0.8.5"; - optional = true; - features = [ "small_rng" ]; - } - { - name = "slab"; - packageId = "slab"; - optional = true; - } - { - name = "tokio"; - packageId = "tokio"; - optional = true; - features = [ "sync" ]; - } - { - name = "tokio-util"; - packageId = "tokio-util"; - optional = true; - usesDefaultFeatures = false; - } - { - name = "tower-layer"; - packageId = "tower-layer"; - } - { - name = "tower-service"; - packageId = "tower-service"; - } - { - name = "tracing"; - packageId = "tracing"; - optional = true; - usesDefaultFeatures = false; - features = [ "std" ]; - } - ]; - devDependencies = [ - { - name = "pin-project-lite"; - packageId = "pin-project-lite"; - } - { - name = "tokio"; - packageId = "tokio"; - features = [ "macros" "sync" "test-util" "rt-multi-thread" ]; - } - ]; - features = { - "__common" = [ "futures-core" "pin-project-lite" ]; - "balance" = [ "discover" "load" "ready-cache" "make" "rand" "slab" ]; - "buffer" = [ "__common" "tokio/sync" "tokio/rt" "tokio-util" "tracing" ]; - "default" = [ "log" ]; - "discover" = [ "__common" ]; - "filter" = [ "__common" "futures-util" ]; - "full" = [ "balance" "buffer" "discover" "filter" "hedge" "limit" "load" "load-shed" "make" "ready-cache" "reconnect" "retry" "spawn-ready" "steer" "timeout" "util" ]; - "futures-core" = [ "dep:futures-core" ]; - "futures-util" = [ "dep:futures-util" ]; - "hdrhistogram" = [ "dep:hdrhistogram" ]; - "hedge" = [ "util" "filter" "futures-util" "hdrhistogram" "tokio/time" "tracing" ]; - "indexmap" = [ "dep:indexmap" ]; - "limit" = [ "__common" "tokio/time" "tokio/sync" "tokio-util" "tracing" ]; - "load" = [ "__common" "tokio/time" "tracing" ]; - "load-shed" = [ "__common" ]; - "log" = [ "tracing/log" ]; - "make" = [ "futures-util" "pin-project-lite" "tokio/io-std" ]; - "pin-project" = [ "dep:pin-project" ]; - "pin-project-lite" = [ "dep:pin-project-lite" ]; - "rand" = [ "dep:rand" ]; - "ready-cache" = [ "futures-core" "futures-util" "indexmap" "tokio/sync" "tracing" "pin-project-lite" ]; - "reconnect" = [ "make" "tokio/io-std" "tracing" ]; - "retry" = [ "__common" "tokio/time" ]; - "slab" = [ "dep:slab" ]; - "spawn-ready" = [ "__common" "futures-util" "tokio/sync" "tokio/rt" "util" "tracing" ]; - "timeout" = [ "pin-project-lite" "tokio/time" ]; - "tokio" = [ "dep:tokio" ]; - "tokio-stream" = [ "dep:tokio-stream" ]; - "tokio-util" = [ "dep:tokio-util" ]; - "tracing" = [ "dep:tracing" ]; - "util" = [ "__common" "futures-util" "pin-project" ]; - }; - resolvedDefaultFeatures = [ "__common" "balance" "buffer" "discover" "futures-core" "futures-util" "indexmap" "limit" "load" "make" "pin-project" "pin-project-lite" "rand" "ready-cache" "slab" "tokio" "tokio-util" "tracing" "util" ]; - }; - "tower 0.5.2" = rec { + "tower" = rec { crateName = "tower"; version = "0.5.2"; edition = "2018"; @@ -10726,7 +10335,7 @@ rec { } { name = "indexmap"; - packageId = "indexmap 2.8.0"; + packageId = "indexmap"; optional = true; } { @@ -11130,9 +10739,9 @@ rec { }; "tracing-opentelemetry" = rec { crateName = "tracing-opentelemetry"; - version = "0.30.0"; + version = "0.31.0"; edition = "2021"; - sha256 = "0i64g7cyrdpzkc2zixz8bd0v1icha63ifcdwpvc3z0gmsr5pd3px"; + sha256 = "171scb8d5ynxvnyvq7lm9wzn4fzk0jf124v49p8d01wmydcmkkyx"; libName = "tracing_opentelemetry"; dependencies = [ { @@ -11199,7 +10808,7 @@ rec { name = "opentelemetry_sdk"; packageId = "opentelemetry_sdk"; usesDefaultFeatures = false; - features = [ "trace" "rt-tokio" ]; + features = [ "trace" "rt-tokio" "experimental_metrics_custom_reader" ]; } { name = "tracing"; diff --git a/Cargo.toml b/Cargo.toml index 807d8c13..187513d6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,3 +39,4 @@ walkdir = "2.5.0" [patch."https://github.com/stackabletech/operator-rs.git"] # stackable-operator = { path = "../operator-rs/crates/stackable-operator" } # stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" } +stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "feature/cluster-detection-local-kubelet" } diff --git a/crate-hashes.json b/crate-hashes.json index 3b97911f..0ff28a0b 100644 --- a/crate-hashes.json +++ b/crate-hashes.json @@ -1,10 +1,10 @@ { - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.93.2#k8s-version@0.1.3": "0604b0vvlzhh7a6pmcnm6k72pnkcv3f171n9981vj06wsbj9j98r", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.93.2#stackable-operator-derive@0.3.1": "0604b0vvlzhh7a6pmcnm6k72pnkcv3f171n9981vj06wsbj9j98r", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.93.2#stackable-operator@0.93.2": "0604b0vvlzhh7a6pmcnm6k72pnkcv3f171n9981vj06wsbj9j98r", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.93.2#stackable-shared@0.0.1": "0604b0vvlzhh7a6pmcnm6k72pnkcv3f171n9981vj06wsbj9j98r", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.93.2#stackable-telemetry@0.6.0": "0604b0vvlzhh7a6pmcnm6k72pnkcv3f171n9981vj06wsbj9j98r", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.93.2#stackable-versioned-macros@0.7.1": "0604b0vvlzhh7a6pmcnm6k72pnkcv3f171n9981vj06wsbj9j98r", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.93.2#stackable-versioned@0.7.1": "0604b0vvlzhh7a6pmcnm6k72pnkcv3f171n9981vj06wsbj9j98r", + "git+https://github.com/stackabletech//operator-rs.git?branch=feature%2Fcluster-detection-local-kubelet#k8s-version@0.1.3": "1n37g6byyi9kkhrsw6g3dy0b5l5xidn7q3h2ypj92qcagz6vgs43", + "git+https://github.com/stackabletech//operator-rs.git?branch=feature%2Fcluster-detection-local-kubelet#stackable-operator-derive@0.3.1": "1n37g6byyi9kkhrsw6g3dy0b5l5xidn7q3h2ypj92qcagz6vgs43", + "git+https://github.com/stackabletech//operator-rs.git?branch=feature%2Fcluster-detection-local-kubelet#stackable-operator@0.93.2": "1n37g6byyi9kkhrsw6g3dy0b5l5xidn7q3h2ypj92qcagz6vgs43", + "git+https://github.com/stackabletech//operator-rs.git?branch=feature%2Fcluster-detection-local-kubelet#stackable-shared@0.0.1": "1n37g6byyi9kkhrsw6g3dy0b5l5xidn7q3h2ypj92qcagz6vgs43", + "git+https://github.com/stackabletech//operator-rs.git?branch=feature%2Fcluster-detection-local-kubelet#stackable-telemetry@0.6.0": "1n37g6byyi9kkhrsw6g3dy0b5l5xidn7q3h2ypj92qcagz6vgs43", + "git+https://github.com/stackabletech//operator-rs.git?branch=feature%2Fcluster-detection-local-kubelet#stackable-versioned-macros@0.7.1": "1n37g6byyi9kkhrsw6g3dy0b5l5xidn7q3h2ypj92qcagz6vgs43", + "git+https://github.com/stackabletech//operator-rs.git?branch=feature%2Fcluster-detection-local-kubelet#stackable-versioned@0.7.1": "1n37g6byyi9kkhrsw6g3dy0b5l5xidn7q3h2ypj92qcagz6vgs43", "git+https://github.com/stackabletech/product-config.git?tag=0.7.0#product-config@0.7.0": "0gjsm80g6r75pm3824dcyiz4ysq1ka4c1if6k1mjm9cnd5ym0gny" } \ No newline at end of file diff --git a/deploy/helm/listener-operator/templates/controller-deployment.yaml b/deploy/helm/listener-operator/templates/controller-deployment.yaml index 5d0e6206..93a35559 100644 --- a/deploy/helm/listener-operator/templates/controller-deployment.yaml +++ b/deploy/helm/listener-operator/templates/controller-deployment.yaml @@ -42,6 +42,10 @@ spec: env: - name: CSI_ENDPOINT value: /csi/csi.sock + - name: KUBERNETES_NODE_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName {{- if .Values.kubernetesClusterDomain }} - name: KUBERNETES_CLUSTER_DOMAIN value: {{ .Values.kubernetesClusterDomain | quote }} diff --git a/deploy/helm/listener-operator/templates/node-daemonset.yaml b/deploy/helm/listener-operator/templates/node-daemonset.yaml index 9f69b7fa..7bc2fa21 100644 --- a/deploy/helm/listener-operator/templates/node-daemonset.yaml +++ b/deploy/helm/listener-operator/templates/node-daemonset.yaml @@ -41,7 +41,7 @@ spec: env: - name: CSI_ENDPOINT value: /csi/csi.sock - - name: NODE_NAME + - name: KUBERNETES_NODE_NAME valueFrom: fieldRef: apiVersion: v1 diff --git a/deploy/helm/listener-operator/templates/roles.yaml b/deploy/helm/listener-operator/templates/roles.yaml index d6a0018f..c6d9b076 100644 --- a/deploy/helm/listener-operator/templates/roles.yaml +++ b/deploy/helm/listener-operator/templates/roles.yaml @@ -83,6 +83,12 @@ rules: - get - list - watch + - apiGroups: + - "" + resources: + - nodes/proxy + verbs: + - get - apiGroups: - storage.k8s.io resources: diff --git a/rust/operator-binary/src/main.rs b/rust/operator-binary/src/main.rs index 42be31a2..7bb4f073 100644 --- a/rust/operator-binary/src/main.rs +++ b/rust/operator-binary/src/main.rs @@ -11,7 +11,10 @@ use csi_server::{ use futures::{FutureExt, TryStreamExt, pin_mut}; use stackable_operator::{ self, YamlSchema, - crd::listener::{Listener, ListenerClass, PodListeners}, + crd::listener::{ + Listener, ListenerClass, ListenerClassVersion, ListenerVersion, PodListeners, + PodListenersVersion, + }, shared::yaml::SerializeOptions, telemetry::{Tracing, tracing::TelemetryOptions}, utils::cluster_info::KubernetesClusterInfoOpts, @@ -53,10 +56,7 @@ struct ListenerOperatorRun { #[derive(Debug, clap::Parser, strum::AsRefStr, strum::Display)] enum RunMode { Controller, - Node { - #[clap(long, env)] - node_name: String, - }, + Node, } mod built_info { @@ -71,11 +71,11 @@ async fn main() -> anyhow::Result<()> { let opts = Opts::parse(); match opts.cmd { stackable_operator::cli::Command::Crd => { - ListenerClass::merged_crd(ListenerClass::V1Alpha1)? + ListenerClass::merged_crd(ListenerClassVersion::V1Alpha1)? .print_yaml_schema(built_info::PKG_VERSION, SerializeOptions::default())?; - Listener::merged_crd(Listener::V1Alpha1)? + Listener::merged_crd(ListenerVersion::V1Alpha1)? .print_yaml_schema(built_info::PKG_VERSION, SerializeOptions::default())?; - PodListeners::merged_crd(PodListeners::V1Alpha1)? + PodListeners::merged_crd(PodListenersVersion::V1Alpha1)? .print_yaml_schema(built_info::PKG_VERSION, SerializeOptions::default())?; } stackable_operator::cli::Command::Run(ListenerOperatorRun { @@ -137,11 +137,11 @@ async fn main() -> anyhow::Result<()> { .await .map_err(|err| err.factor_first().0)?; } - RunMode::Node { node_name } => { + RunMode::Node => { csi_server .add_service(NodeServer::new(ListenerOperatorNode { client: client.clone(), - node_name, + node_name: cluster_info_opts.kubernetes_node_name, })) .serve_with_incoming_shutdown(csi_listener, sigterm.recv().map(|_| ())) .await?;