diff --git a/Cargo.lock b/Cargo.lock index fd724ad7..b0e5ac92 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -307,9 +307,9 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] name = "bitflags" -version = "2.9.2" +version = "2.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a65b545ab31d687cff52899d4890855fec459eb6afe0da6417b8a18da87aa29" +checksum = "34efbcccd345379ca2868b2b2c9d3782e9cc58ba87bc7d79d5b53d9c9ae6f25d" [[package]] name = "block-buffer" @@ -350,9 +350,9 @@ checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" [[package]] name = "cc" -version = "1.2.33" +version = "1.2.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ee0f8803222ba5a7e2777dd72ca451868909b1ac410621b676adf07280e9b5f" +checksum = "42bc4aea80032b7bf409b0bc7ccad88853858911b7713a8062fdc0623867bedc" dependencies = [ "jobserver", "libc", @@ -585,12 +585,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.21.2" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08440b3dd222c3d0433e63e097463969485f112baff337dfdaca043a0d760570" +checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0" dependencies = [ - "darling_core 0.21.2", - "darling_macro 0.21.2", + "darling_core 0.21.3", + "darling_macro 0.21.3", ] [[package]] @@ -609,9 +609,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.21.2" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d25b7912bc28a04ab1b7715a68ea03aaa15662b43a1a4b2c480531fd19f8bf7e" +checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4" dependencies = [ "fnv", "ident_case", @@ -634,11 +634,11 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.21.2" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce154b9bea7fb0c8e8326e62d00354000c36e79770ff21b8c84e3aa267d9d531" +checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" dependencies = [ - "darling_core 0.21.2", + "darling_core 0.21.3", "quote", "syn 2.0.106", ] @@ -830,8 +830,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2" dependencies = [ "bit-set", - "regex-automata 0.4.9", - "regex-syntax 0.8.5", + "regex-automata 0.4.10", + "regex-syntax 0.8.6", ] [[package]] @@ -1452,9 +1452,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661" +checksum = "f2481980430f9f78649238835720ddccc57e52df14ffce1c6f37391d61b563e9" dependencies = [ "equivalent", "hashbrown", @@ -1468,9 +1468,9 @@ checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd" [[package]] name = "io-uring" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4" +checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b" dependencies = [ "bitflags", "cfg-if", @@ -1536,9 +1536,9 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.33" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a" +checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" dependencies = [ "getrandom 0.3.3", "libc", @@ -1605,9 +1605,9 @@ dependencies = [ [[package]] name = "k8s-version" version = "0.1.3" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.95.0#20659fe864c643fe48c7ff70ed417f0ed05ccf45" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.96.0#89f484ca4e86b565e083e9ad7573e21dbe29a3af" dependencies = [ - "darling 0.21.2", + "darling 0.21.3", "regex", "snafu 0.8.7", ] @@ -2479,14 +2479,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.1" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.9", - "regex-syntax 0.8.5", + "regex-automata 0.4.10", + "regex-syntax 0.8.6", ] [[package]] @@ -2500,13 +2500,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.5", + "regex-syntax 0.8.6", ] [[package]] @@ -2517,9 +2517,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" +checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001" [[package]] name = "reqwest" @@ -3070,8 +3070,8 @@ dependencies = [ [[package]] name = "stackable-operator" -version = "0.95.0" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.95.0#20659fe864c643fe48c7ff70ed417f0ed05ccf45" +version = "0.96.0" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.96.0#89f484ca4e86b565e083e9ad7573e21dbe29a3af" dependencies = [ "chrono", "clap", @@ -3109,9 +3109,9 @@ dependencies = [ [[package]] name = "stackable-operator-derive" version = "0.3.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.95.0#20659fe864c643fe48c7ff70ed417f0ed05ccf45" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.96.0#89f484ca4e86b565e083e9ad7573e21dbe29a3af" dependencies = [ - "darling 0.21.2", + "darling 0.21.3", "proc-macro2", "quote", "syn 2.0.106", @@ -3120,7 +3120,7 @@ dependencies = [ [[package]] name = "stackable-shared" version = "0.0.2" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.95.0#20659fe864c643fe48c7ff70ed417f0ed05ccf45" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.96.0#89f484ca4e86b565e083e9ad7573e21dbe29a3af" dependencies = [ "k8s-openapi", "kube", @@ -3136,7 +3136,7 @@ dependencies = [ [[package]] name = "stackable-telemetry" version = "0.6.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.95.0#20659fe864c643fe48c7ff70ed417f0ed05ccf45" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.96.0#89f484ca4e86b565e083e9ad7573e21dbe29a3af" dependencies = [ "axum", "clap", @@ -3160,7 +3160,7 @@ dependencies = [ [[package]] name = "stackable-versioned" version = "0.8.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.95.0#20659fe864c643fe48c7ff70ed417f0ed05ccf45" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.96.0#89f484ca4e86b565e083e9ad7573e21dbe29a3af" dependencies = [ "schemars", "serde", @@ -3173,10 +3173,10 @@ dependencies = [ [[package]] name = "stackable-versioned-macros" version = "0.8.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.95.0#20659fe864c643fe48c7ff70ed417f0ed05ccf45" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.96.0#89f484ca4e86b565e083e9ad7573e21dbe29a3af" dependencies = [ "convert_case", - "darling 0.21.2", + "darling 0.21.3", "indoc", "itertools 0.14.0", "k8s-openapi", @@ -3713,9 +3713,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.5" +version = "2.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec961601b32b6f5d14ae8dabd35ff2ff2e2c6cb4c0e6641845ff105abe96d958" +checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b" dependencies = [ "form_urlencoded", "idna", diff --git a/Cargo.nix b/Cargo.nix index 536601fb..131cd3c9 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -1055,9 +1055,9 @@ rec { }; "bitflags" = rec { crateName = "bitflags"; - version = "2.9.2"; + version = "2.9.3"; edition = "2021"; - sha256 = "0adahzd1i2kv86k0vzkaxdcw9zjm124x9698yp7qgmiimd2varba"; + sha256 = "0pgjwsd9qgdmsmwpvg47p9ccrsc26yfjqawbhsi9qds5sg6brvrl"; authors = [ "The Rust Project Developers" ]; @@ -1163,9 +1163,9 @@ rec { }; "cc" = rec { crateName = "cc"; - version = "1.2.33"; + version = "1.2.34"; edition = "2018"; - sha256 = "0pwv1ql0gpvacwdn44643adr0s0q8p575pbp4xz5mfi26a0giq1y"; + sha256 = "1p5ycww65h7xca03lwdp264qalw8v357rg5h17s7naq3h3m4mg22"; authors = [ "Alex Crichton " ]; @@ -1861,22 +1861,22 @@ rec { }; resolvedDefaultFeatures = [ "default" "suggestions" ]; }; - "darling 0.21.2" = rec { + "darling 0.21.3" = rec { crateName = "darling"; - version = "0.21.2"; + version = "0.21.3"; edition = "2021"; - sha256 = "0w05fq6kl16avbgkgwxg5c8myj397539gq337r1x1hr2s8yhni08"; + sha256 = "1h281ah78pz05450r71h3gwm2n24hy8yngbz58g426l4j1q37pww"; authors = [ "Ted Driggs " ]; dependencies = [ { name = "darling_core"; - packageId = "darling_core 0.21.2"; + packageId = "darling_core 0.21.3"; } { name = "darling_macro"; - packageId = "darling_macro 0.21.2"; + packageId = "darling_macro 0.21.3"; } ]; features = { @@ -1929,11 +1929,11 @@ rec { }; resolvedDefaultFeatures = [ "strsim" "suggestions" ]; }; - "darling_core 0.21.2" = rec { + "darling_core 0.21.3" = rec { crateName = "darling_core"; - version = "0.21.2"; + version = "0.21.3"; edition = "2021"; - sha256 = "0zmzz0czsc8590n4n6isnii5d8da0gm6hnkinyqlm818ph97jnyj"; + sha256 = "193ya45qgac0a4siwghk0bl8im8h89p3cald7kw8ag3yrmg1jiqj"; authors = [ "Ted Driggs " ]; @@ -1997,11 +1997,11 @@ rec { ]; }; - "darling_macro 0.21.2" = rec { + "darling_macro 0.21.3" = rec { crateName = "darling_macro"; - version = "0.21.2"; + version = "0.21.3"; edition = "2021"; - sha256 = "0cfmv5ks4fjfr2w23zvhjzkkc300ah1x0qkf6blcic3zxadln5ff"; + sha256 = "10ac85n4lnx3rmf5rw8lijl2c0sbl6ghcpgfmzh0s26ihbghi0yk"; procMacro = true; authors = [ "Ted Driggs " @@ -2009,7 +2009,7 @@ rec { dependencies = [ { name = "darling_core"; - packageId = "darling_core 0.21.2"; + packageId = "darling_core 0.21.3"; } { name = "quote"; @@ -2562,13 +2562,13 @@ rec { } { name = "regex-automata"; - packageId = "regex-automata 0.4.9"; + packageId = "regex-automata 0.4.10"; usesDefaultFeatures = false; features = [ "alloc" "syntax" "meta" "nfa" "dfa" "hybrid" ]; } { name = "regex-syntax"; - packageId = "regex-syntax 0.8.5"; + packageId = "regex-syntax 0.8.6"; usesDefaultFeatures = false; } ]; @@ -4654,9 +4654,9 @@ rec { }; "indexmap" = rec { crateName = "indexmap"; - version = "2.10.0"; + version = "2.11.0"; edition = "2021"; - sha256 = "0qd6g26gxzl6dbf132w48fa8rr95glly3jhbk90i29726d9xhk7y"; + sha256 = "1sb3nmhisf9pdwfcxzqlvx97xifcvlh5g0rqj9j7i7qg8f01jj7j"; dependencies = [ { name = "equivalent"; @@ -4676,6 +4676,7 @@ rec { "quickcheck" = [ "dep:quickcheck" ]; "rayon" = [ "dep:rayon" ]; "serde" = [ "dep:serde" ]; + "sval" = [ "dep:sval" ]; }; resolvedDefaultFeatures = [ "default" "std" ]; }; @@ -4692,9 +4693,9 @@ rec { }; "io-uring" = rec { crateName = "io-uring"; - version = "0.7.9"; + version = "0.7.10"; edition = "2021"; - sha256 = "1i60fxfbxypfgfmq883kwxgldxcjlnnwjazgjiys3893fvrqfdfr"; + sha256 = "0yvjyygwdcqjcgw8zp254hvjbm7as1c075dl50spdshas3aa4vq4"; libName = "io_uring"; authors = [ "quininer " @@ -4861,9 +4862,9 @@ rec { }; "jobserver" = rec { crateName = "jobserver"; - version = "0.1.33"; + version = "0.1.34"; edition = "2021"; - sha256 = "12jkn3cxvfs7jsb6knmh9y2b41lwmrk3vdqywkmssx61jzq65wiq"; + sha256 = "0cwx0fllqzdycqn4d6nb277qx5qwnmjdxdl0lxkkwssx77j3vyws"; authors = [ "Alex Crichton " ]; @@ -5075,8 +5076,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "20659fe864c643fe48c7ff70ed417f0ed05ccf45"; - sha256 = "0db745j2nz5kz5mp8sh8af26gh9wx3cdad7ggl9f9jki1ms534z0"; + rev = "89f484ca4e86b565e083e9ad7573e21dbe29a3af"; + sha256 = "05xhfz0bd09095ljkaj950r80bchdb202d8nka95cq356y4wha4c"; }; libName = "k8s_version"; authors = [ @@ -5085,7 +5086,7 @@ rec { dependencies = [ { name = "darling"; - packageId = "darling 0.21.2"; + packageId = "darling 0.21.3"; optional = true; } { @@ -7986,9 +7987,9 @@ rec { }; "regex" = rec { crateName = "regex"; - version = "1.11.1"; + version = "1.11.2"; edition = "2021"; - sha256 = "148i41mzbx8bmq32hsj1q4karkzzx5m60qza6gdw4pdc9qdyyi5m"; + sha256 = "04k9rzxd11hcahpyihlswy6f1zqw7lspirv4imm4h0lcdl8gvmr3"; authors = [ "The Rust Project Developers" "Andrew Gallant " @@ -8008,13 +8009,13 @@ rec { } { name = "regex-automata"; - packageId = "regex-automata 0.4.9"; + packageId = "regex-automata 0.4.10"; usesDefaultFeatures = false; features = [ "alloc" "syntax" "meta" "nfa-pikevm" ]; } { name = "regex-syntax"; - packageId = "regex-syntax 0.8.5"; + packageId = "regex-syntax 0.8.6"; usesDefaultFeatures = false; } ]; @@ -8067,11 +8068,11 @@ rec { }; resolvedDefaultFeatures = [ "default" "regex-syntax" "std" ]; }; - "regex-automata 0.4.9" = rec { + "regex-automata 0.4.10" = rec { crateName = "regex-automata"; - version = "0.4.9"; + version = "0.4.10"; edition = "2021"; - sha256 = "02092l8zfh3vkmk47yjc8d631zhhcd49ck2zr133prvd3z38v7l0"; + sha256 = "1mllcfmgjcl6d52d5k09lwwq9wj5mwxccix4bhmw5spy1gx5i53b"; libName = "regex_automata"; authors = [ "The Rust Project Developers" @@ -8092,7 +8093,7 @@ rec { } { name = "regex-syntax"; - packageId = "regex-syntax 0.8.5"; + packageId = "regex-syntax 0.8.6"; optional = true; usesDefaultFeatures = false; } @@ -8113,7 +8114,7 @@ rec { "nfa-thompson" = [ "alloc" ]; "perf" = [ "perf-inline" "perf-literal" ]; "perf-literal" = [ "perf-literal-substring" "perf-literal-multisubstring" ]; - "perf-literal-multisubstring" = [ "std" "dep:aho-corasick" ]; + "perf-literal-multisubstring" = [ "dep:aho-corasick" ]; "perf-literal-substring" = [ "aho-corasick?/perf-literal" "dep:memchr" ]; "std" = [ "regex-syntax?/std" "memchr?/std" "aho-corasick?/std" "alloc" ]; "syntax" = [ "dep:regex-syntax" "alloc" ]; @@ -8143,11 +8144,11 @@ rec { }; resolvedDefaultFeatures = [ "default" "unicode" "unicode-age" "unicode-bool" "unicode-case" "unicode-gencat" "unicode-perl" "unicode-script" "unicode-segment" ]; }; - "regex-syntax 0.8.5" = rec { + "regex-syntax 0.8.6" = rec { crateName = "regex-syntax"; - version = "0.8.5"; + version = "0.8.6"; edition = "2021"; - sha256 = "0p41p3hj9ww7blnbwbj9h7rwxzxg0c1hvrdycgys8rxyhqqw859b"; + sha256 = "00chjpglclfskmc919fj5aq308ffbrmcn7kzbkz92k231xdsmx6a"; libName = "regex_syntax"; authors = [ "The Rust Project Developers" @@ -10071,13 +10072,13 @@ rec { }; "stackable-operator" = rec { crateName = "stackable-operator"; - version = "0.95.0"; + version = "0.96.0"; edition = "2024"; workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "20659fe864c643fe48c7ff70ed417f0ed05ccf45"; - sha256 = "0db745j2nz5kz5mp8sh8af26gh9wx3cdad7ggl9f9jki1ms534z0"; + rev = "89f484ca4e86b565e083e9ad7573e21dbe29a3af"; + sha256 = "05xhfz0bd09095ljkaj950r80bchdb202d8nka95cq356y4wha4c"; }; libName = "stackable_operator"; authors = [ @@ -10244,8 +10245,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "20659fe864c643fe48c7ff70ed417f0ed05ccf45"; - sha256 = "0db745j2nz5kz5mp8sh8af26gh9wx3cdad7ggl9f9jki1ms534z0"; + rev = "89f484ca4e86b565e083e9ad7573e21dbe29a3af"; + sha256 = "05xhfz0bd09095ljkaj950r80bchdb202d8nka95cq356y4wha4c"; }; procMacro = true; libName = "stackable_operator_derive"; @@ -10255,7 +10256,7 @@ rec { dependencies = [ { name = "darling"; - packageId = "darling 0.21.2"; + packageId = "darling 0.21.3"; } { name = "proc-macro2"; @@ -10279,8 +10280,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "20659fe864c643fe48c7ff70ed417f0ed05ccf45"; - sha256 = "0db745j2nz5kz5mp8sh8af26gh9wx3cdad7ggl9f9jki1ms534z0"; + rev = "89f484ca4e86b565e083e9ad7573e21dbe29a3af"; + sha256 = "05xhfz0bd09095ljkaj950r80bchdb202d8nka95cq356y4wha4c"; }; libName = "stackable_shared"; authors = [ @@ -10354,8 +10355,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "20659fe864c643fe48c7ff70ed417f0ed05ccf45"; - sha256 = "0db745j2nz5kz5mp8sh8af26gh9wx3cdad7ggl9f9jki1ms534z0"; + rev = "89f484ca4e86b565e083e9ad7573e21dbe29a3af"; + sha256 = "05xhfz0bd09095ljkaj950r80bchdb202d8nka95cq356y4wha4c"; }; libName = "stackable_telemetry"; authors = [ @@ -10464,8 +10465,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "20659fe864c643fe48c7ff70ed417f0ed05ccf45"; - sha256 = "0db745j2nz5kz5mp8sh8af26gh9wx3cdad7ggl9f9jki1ms534z0"; + rev = "89f484ca4e86b565e083e9ad7573e21dbe29a3af"; + sha256 = "05xhfz0bd09095ljkaj950r80bchdb202d8nka95cq356y4wha4c"; }; libName = "stackable_versioned"; authors = [ @@ -10508,8 +10509,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "20659fe864c643fe48c7ff70ed417f0ed05ccf45"; - sha256 = "0db745j2nz5kz5mp8sh8af26gh9wx3cdad7ggl9f9jki1ms534z0"; + rev = "89f484ca4e86b565e083e9ad7573e21dbe29a3af"; + sha256 = "05xhfz0bd09095ljkaj950r80bchdb202d8nka95cq356y4wha4c"; }; procMacro = true; libName = "stackable_versioned_macros"; @@ -10523,7 +10524,7 @@ rec { } { name = "darling"; - packageId = "darling 0.21.2"; + packageId = "darling 0.21.3"; } { name = "indoc"; @@ -12411,9 +12412,9 @@ rec { }; "url" = rec { crateName = "url"; - version = "2.5.5"; + version = "2.5.7"; edition = "2018"; - sha256 = "0n6rjsz5l47z8lc69rn0nin2qbpzy9gx7awdmqa5svrbnc0id5pc"; + sha256 = "0nzghdv0kcksyvri0npxbjzyx2ihprks5k590y77bld355m17g08"; authors = [ "The rust-url developers" ]; @@ -12454,7 +12455,7 @@ rec { features = { "default" = [ "std" ]; "serde" = [ "dep:serde" ]; - "std" = [ "idna/std" "percent-encoding/std" "form_urlencoded/std" ]; + "std" = [ "idna/std" "percent-encoding/std" "form_urlencoded/std" "serde/std" ]; }; resolvedDefaultFeatures = [ "default" "serde" "std" ]; }; diff --git a/Cargo.toml b/Cargo.toml index cdaf29a9..7650e5d7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,10 +11,9 @@ repository = "https://github.com/stackabletech/opa-operator" [workspace.dependencies] product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.7.0" } -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", features = ["telemetry", "versioned"], tag = "stackable-operator-0.95.0" } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", features = ["telemetry", "versioned"], tag = "stackable-operator-0.96.0" } krb5 = { git = "https://github.com/stackabletech/krb5-rs.git", tag = "v0.1.0" } - anyhow = "1.0" axum = "0.8" base64 = "0.22" diff --git a/crate-hashes.json b/crate-hashes.json index b6cd8c14..30a54dc0 100644 --- a/crate-hashes.json +++ b/crate-hashes.json @@ -1,12 +1,12 @@ { "git+https://github.com/stackabletech/krb5-rs.git?tag=v0.1.0#krb5-sys@0.1.0": "148zr0q04163hpirkrff5q7cbxqgwzzxh0091zr4g23x7l64jh39", "git+https://github.com/stackabletech/krb5-rs.git?tag=v0.1.0#krb5@0.1.0": "148zr0q04163hpirkrff5q7cbxqgwzzxh0091zr4g23x7l64jh39", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.95.0#k8s-version@0.1.3": "0db745j2nz5kz5mp8sh8af26gh9wx3cdad7ggl9f9jki1ms534z0", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.95.0#stackable-operator-derive@0.3.1": "0db745j2nz5kz5mp8sh8af26gh9wx3cdad7ggl9f9jki1ms534z0", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.95.0#stackable-operator@0.95.0": "0db745j2nz5kz5mp8sh8af26gh9wx3cdad7ggl9f9jki1ms534z0", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.95.0#stackable-shared@0.0.2": "0db745j2nz5kz5mp8sh8af26gh9wx3cdad7ggl9f9jki1ms534z0", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.95.0#stackable-telemetry@0.6.1": "0db745j2nz5kz5mp8sh8af26gh9wx3cdad7ggl9f9jki1ms534z0", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.95.0#stackable-versioned-macros@0.8.1": "0db745j2nz5kz5mp8sh8af26gh9wx3cdad7ggl9f9jki1ms534z0", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.95.0#stackable-versioned@0.8.1": "0db745j2nz5kz5mp8sh8af26gh9wx3cdad7ggl9f9jki1ms534z0", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.96.0#k8s-version@0.1.3": "05xhfz0bd09095ljkaj950r80bchdb202d8nka95cq356y4wha4c", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.96.0#stackable-operator-derive@0.3.1": "05xhfz0bd09095ljkaj950r80bchdb202d8nka95cq356y4wha4c", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.96.0#stackable-operator@0.96.0": "05xhfz0bd09095ljkaj950r80bchdb202d8nka95cq356y4wha4c", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.96.0#stackable-shared@0.0.2": "05xhfz0bd09095ljkaj950r80bchdb202d8nka95cq356y4wha4c", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.96.0#stackable-telemetry@0.6.1": "05xhfz0bd09095ljkaj950r80bchdb202d8nka95cq356y4wha4c", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.96.0#stackable-versioned-macros@0.8.1": "05xhfz0bd09095ljkaj950r80bchdb202d8nka95cq356y4wha4c", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.96.0#stackable-versioned@0.8.1": "05xhfz0bd09095ljkaj950r80bchdb202d8nka95cq356y4wha4c", "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/rust/bundle-builder/src/main.rs b/rust/bundle-builder/src/main.rs index 9f6b4793..1b9f7a4b 100644 --- a/rust/bundle-builder/src/main.rs +++ b/rust/bundle-builder/src/main.rs @@ -17,6 +17,7 @@ use futures::{ }; use snafu::{ResultExt, Snafu}; use stackable_operator::{ + cli::CommonOptions, k8s_openapi::api::core::v1::ConfigMap, kube::{ api::ObjectMeta, @@ -25,6 +26,7 @@ use stackable_operator::{ watcher, }, }, + namespace::WatchNamespace, telemetry::Tracing, }; use tokio::net::TcpListener; @@ -39,7 +41,11 @@ pub const APP_NAME: &str = "opa-bundle-builder"; #[derive(clap::Parser)] pub struct Args { #[clap(flatten)] - common: stackable_operator::cli::ProductOperatorRun, + pub common: CommonOptions, + + /// Provides a specific namespace to watch (instead of watching all namespaces) + #[arg(long, env, default_value = "")] + pub watch_namespace: WatchNamespace, } type Bundle = Vec; @@ -121,7 +127,7 @@ async fn main() -> Result<(), StartupError> { let reflector = std::pin::pin!(reflector::reflector( store_w, watcher( - args.common.watch_namespace.get_api::(&client), + args.watch_namespace.get_api::(&client), watcher::Config::default().labels(&format!("{OPERATOR_NAME}/bundle")), ), ) diff --git a/rust/operator-binary/src/main.rs b/rust/operator-binary/src/main.rs index 5d1e0eba..ef6ad257 100644 --- a/rust/operator-binary/src/main.rs +++ b/rust/operator-binary/src/main.rs @@ -9,7 +9,7 @@ use product_config::ProductConfigManager; use stackable_opa_operator::crd::{OPERATOR_NAME, OpaCluster, OpaClusterVersion, v1alpha1}; use stackable_operator::{ YamlSchema, - cli::{Command, ProductOperatorRun}, + cli::{Command, CommonOptions, ProductOperatorRun}, client::{self, Client}, k8s_openapi::api::{ apps::v1::DaemonSet, @@ -71,11 +71,14 @@ async fn main() -> anyhow::Result<()> { operator_image, common: ProductOperatorRun { + common: + CommonOptions { + telemetry, + cluster_info, + }, product_config, watch_namespace, operator_environment: _, - telemetry, - cluster_info, }, }) => { // NOTE (@NickLarsenNZ): Before stackable-telemetry was used: diff --git a/rust/user-info-fetcher/src/main.rs b/rust/user-info-fetcher/src/main.rs index d945a208..386b67bd 100644 --- a/rust/user-info-fetcher/src/main.rs +++ b/rust/user-info-fetcher/src/main.rs @@ -13,7 +13,9 @@ use reqwest::ClientBuilder; use serde::{Deserialize, Serialize}; use snafu::{ResultExt, Snafu}; use stackable_opa_operator::crd::user_info_fetcher::v1alpha1; -use stackable_operator::{commons::tls_verification::TlsClientDetails, telemetry::Tracing}; +use stackable_operator::{ + cli::CommonOptions, commons::tls_verification::TlsClientDetails, telemetry::Tracing, +}; use tokio::net::TcpListener; mod backend; @@ -28,12 +30,14 @@ pub const APP_NAME: &str = "opa-user-info-fetcher"; #[derive(clap::Parser)] pub struct Args { + #[clap(flatten)] + common: CommonOptions, + #[clap(long, env)] config: PathBuf, + #[clap(long, env)] credentials_dir: PathBuf, - #[clap(flatten)] - common: stackable_operator::cli::ProductOperatorRun, } #[derive(Clone)]