diff --git a/CHANGELOG.md b/CHANGELOG.md index f7506830..b967225e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,9 @@ All notable changes to this project will be documented in this file. - BREAKING: The fields `connection` and `host` on `S3Connection` as well as `bucketName` on `S3Bucket`are now mandatory ([#632]). - Failing to parse one `DruidCluster`/`AuthenticationClass` should no longer cause the whole operator to stop functioning ([#638]). - Fix OIDC endpoint construction in case the `rootPath` does have a trailing slash ([#656]). +- BREAKING: Use distinct ServiceAccounts for the Stacklets, so that multiple Stacklets can be + deployed in one namespace. Existing Stacklets will use the newly created ServiceAccounts after + restart ([#657]). ### Removed @@ -39,6 +42,7 @@ All notable changes to this project will be documented in this file. [#637]: https://github.com/stackabletech/druid-operator/pull/637 [#638]: https://github.com/stackabletech/druid-operator/pull/638 [#656]: https://github.com/stackabletech/druid-operator/pull/656 +[#657]: https://github.com/stackabletech/druid-operator/pull/657 ## [24.7.0] - 2024-07-24 diff --git a/Cargo.lock b/Cargo.lock index f081149d..5014a2c7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2443,8 +2443,8 @@ dependencies = [ [[package]] name = "stackable-operator" -version = "0.81.0" -source = "git+https://github.com/stackabletech//operator-rs.git?rev=de15662cb45ffe7fefb807162dbaa0b377a3bb5f#de15662cb45ffe7fefb807162dbaa0b377a3bb5f" +version = "0.82.0" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.82.0#415bbd031bd52e9c0c5392060235030e9930b46b" dependencies = [ "chrono", "clap", @@ -2482,7 +2482,7 @@ dependencies = [ [[package]] name = "stackable-operator-derive" version = "0.3.1" -source = "git+https://github.com/stackabletech//operator-rs.git?rev=de15662cb45ffe7fefb807162dbaa0b377a3bb5f#de15662cb45ffe7fefb807162dbaa0b377a3bb5f" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.82.0#415bbd031bd52e9c0c5392060235030e9930b46b" dependencies = [ "darling", "proc-macro2", @@ -2493,7 +2493,7 @@ dependencies = [ [[package]] name = "stackable-shared" version = "0.0.1" -source = "git+https://github.com/stackabletech//operator-rs.git?rev=de15662cb45ffe7fefb807162dbaa0b377a3bb5f#de15662cb45ffe7fefb807162dbaa0b377a3bb5f" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.82.0#415bbd031bd52e9c0c5392060235030e9930b46b" dependencies = [ "kube", "semver", diff --git a/Cargo.nix b/Cargo.nix index 72a0d09f..5e3f89ad 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -205,9 +205,9 @@ rec { }; "allocator-api2" = rec { crateName = "allocator-api2"; - version = "0.2.18"; + version = "0.2.20"; edition = "2018"; - sha256 = "0kr6lfnxvnj164j1x38g97qjlhb7akppqzvgfs0697140ixbav2w"; + sha256 = "1n9ryymwk9k7a5fqvbc7kfy6xn03q9drsq5w22g8n8pjfwf2v1j5"; libName = "allocator_api2"; authors = [ "Zakarum " @@ -248,9 +248,9 @@ rec { }; "anstream" = rec { crateName = "anstream"; - version = "0.6.15"; + version = "0.6.18"; edition = "2021"; - sha256 = "09nm4qj34kiwgzczdvj14x7hgsb235g4sqsay3xsz7zqn4d5rqb4"; + sha256 = "16sjk4x3ns2c3ya1x28a44kh6p47c7vhk27251i015hik1lm7k4a"; dependencies = [ { name = "anstyle"; @@ -293,9 +293,9 @@ rec { }; "anstyle" = rec { crateName = "anstyle"; - version = "1.0.8"; + version = "1.0.10"; edition = "2021"; - sha256 = "1cfmkza63xpn1kkz844mgjwm9miaiz4jkyczmwxzivcsypk1vv0v"; + sha256 = "1yai2vppmd7zlvlrp9grwll60knrmscalf8l2qpfz8b7y5lkpk2m"; features = { "default" = [ "std" ]; }; @@ -303,9 +303,9 @@ rec { }; "anstyle-parse" = rec { crateName = "anstyle-parse"; - version = "0.2.5"; + version = "0.2.6"; edition = "2021"; - sha256 = "1jy12rvgbldflnb2x7mcww9dcffw1mx22nyv6p3n7d62h0gdwizb"; + sha256 = "1acqayy22fwzsrvr6n0lz6a4zvjjcvgr5sm941m7m0b2fr81cb9v"; libName = "anstyle_parse"; dependencies = [ { @@ -323,14 +323,14 @@ rec { }; "anstyle-query" = rec { crateName = "anstyle-query"; - version = "1.1.1"; + version = "1.1.2"; edition = "2021"; - sha256 = "0aj22iy4pzk6mz745sfrm1ym14r0y892jhcrbs8nkj7nqx9gqdkd"; + sha256 = "036nm3lkyk43xbps1yql3583fp4hg3b1600is7mcyxs1gzrpm53r"; libName = "anstyle_query"; dependencies = [ { name = "windows-sys"; - packageId = "windows-sys 0.52.0"; + packageId = "windows-sys 0.59.0"; target = { target, features }: (target."windows" or false); features = [ "Win32_System_Console" "Win32_Foundation" ]; } @@ -339,9 +339,9 @@ rec { }; "anstyle-wincon" = rec { crateName = "anstyle-wincon"; - version = "3.0.4"; + version = "3.0.6"; edition = "2021"; - sha256 = "1y2pkvsrdxbcwircahb4wimans2pzmwwxad7ikdhj5lpdqdlxxsv"; + sha256 = "099ir0w3lbpsp1nxdzbf4anq98ww8ykyc9pd1g03xgkj1v7dn291"; libName = "anstyle_wincon"; dependencies = [ { @@ -350,7 +350,7 @@ rec { } { name = "windows-sys"; - packageId = "windows-sys 0.52.0"; + packageId = "windows-sys 0.59.0"; target = { target, features }: (target."windows" or false); features = [ "Win32_System_Console" "Win32_Foundation" ]; } @@ -359,9 +359,9 @@ rec { }; "anyhow" = rec { crateName = "anyhow"; - version = "1.0.91"; + version = "1.0.93"; edition = "2018"; - sha256 = "1j2hg3d0lk2pihfsknxrncmijhz07fspkzd5c0vxhzyp7s7i0hn0"; + sha256 = "0xapv1bck3pvwqk06xn4b8nk5c88cja19f1qc9ih42mhl05w35ac"; authors = [ "David Tolnay " ]; @@ -448,7 +448,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.82"; + packageId = "syn 2.0.89"; features = [ "full" "visit-mut" ]; } ]; @@ -475,7 +475,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.82"; + packageId = "syn 2.0.89"; usesDefaultFeatures = false; features = [ "full" "parsing" "printing" "proc-macro" "visit-mut" ]; } @@ -775,9 +775,9 @@ rec { }; "cc" = rec { crateName = "cc"; - version = "1.1.31"; + version = "1.2.1"; edition = "2018"; - sha256 = "0vscf59yxf665s4fv9yn3l39gfw99mgp6wnbc76cyv80ahmrdry2"; + sha256 = "0izavwg0w3ahhp8jhajy97adv53r6ggv11g6czyz6pjx43rfk7gx"; authors = [ "Alex Crichton " ]; @@ -883,10 +883,10 @@ rec { }; "clap" = rec { crateName = "clap"; - version = "4.5.20"; + version = "4.5.21"; edition = "2021"; crateBin = []; - sha256 = "1s37v23gcxkjy4800qgnkxkpliz68vslpr5sgn1xar56hmnkfzxr"; + sha256 = "0kv0n5jbpfpl9xyags5lpyq5cccbx6g36s98lpgi8xbwbag4nfzv"; dependencies = [ { name = "clap_builder"; @@ -924,9 +924,9 @@ rec { }; "clap_builder" = rec { crateName = "clap_builder"; - version = "4.5.20"; + version = "4.5.21"; edition = "2021"; - sha256 = "0m6w10l2f65h3ch0d53lql6p26xxrh20ffipra9ysjsfsjmq1g0r"; + sha256 = "1v10zx5v43yk7f4wwr0wxxlr1mx0k8c70lxa6aymwyyccym9aymi"; dependencies = [ { name = "anstream"; @@ -982,7 +982,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.82"; + packageId = "syn 2.0.89"; features = [ "full" ]; } ]; @@ -994,16 +994,16 @@ rec { }; "clap_lex" = rec { crateName = "clap_lex"; - version = "0.7.2"; + version = "0.7.3"; edition = "2021"; - sha256 = "15zcrc2fa6ycdzaihxghf48180bnvzsivhf0fmah24bnnaf76qhl"; + sha256 = "19yq37my1a5ndx0wlsj6ww03q0yqw2p9h4z0jml0vf978a0lrf5g"; }; "colorchoice" = rec { crateName = "colorchoice"; - version = "1.0.2"; + version = "1.0.3"; edition = "2021"; - sha256 = "1h18ph538y8yjmbpaf8li98l0ifms2xmh3rax9666c5qfjfi3zfk"; + sha256 = "1439m3r3jy3xqck8aa13q658visn71ki76qa93cy55wkmalwlqsv"; }; "concurrent-queue" = rec { @@ -1094,7 +1094,37 @@ rec { }; resolvedDefaultFeatures = [ "default" ]; }; - "core-foundation" = rec { + "core-foundation 0.10.0" = rec { + crateName = "core-foundation"; + version = "0.10.0"; + edition = "2018"; + sha256 = "0qscay14s2rwkg8nd8ljhiaf149hj8sfy95d70zssy64r3jp2lmm"; + libName = "core_foundation"; + authors = [ + "The Servo Project Developers" + ]; + dependencies = [ + { + name = "core-foundation-sys"; + packageId = "core-foundation-sys"; + usesDefaultFeatures = false; + } + { + name = "libc"; + packageId = "libc"; + } + ]; + features = { + "default" = [ "link" ]; + "link" = [ "core-foundation-sys/link" ]; + "mac_os_10_7_support" = [ "core-foundation-sys/mac_os_10_7_support" ]; + "mac_os_10_8_features" = [ "core-foundation-sys/mac_os_10_8_features" ]; + "uuid" = [ "dep:uuid" ]; + "with-uuid" = [ "uuid" ]; + }; + resolvedDefaultFeatures = [ "default" "link" ]; + }; + "core-foundation 0.9.4" = rec { crateName = "core-foundation"; version = "0.9.4"; edition = "2018"; @@ -1142,9 +1172,9 @@ rec { }; "cpufeatures" = rec { crateName = "cpufeatures"; - version = "0.2.14"; + version = "0.2.16"; edition = "2018"; - sha256 = "1q3qd9qkw94vs7n5i0y3zz2cqgzcxvdgyb54ryngwmjhfbgrg1k0"; + sha256 = "1hy466fkhxjbb16i7na95wz8yr14d0kd578pwzj5lbkz14jh5f0n"; authors = [ "RustCrypto Developers" ]; @@ -1286,7 +1316,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.82"; + packageId = "syn 2.0.89"; features = [ "full" "extra-traits" ]; } ]; @@ -1316,7 +1346,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.82"; + packageId = "syn 2.0.89"; } ]; @@ -1342,7 +1372,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.82"; + packageId = "syn 2.0.89"; features = [ "full" "visit-mut" ]; } ]; @@ -1436,6 +1466,33 @@ rec { }; resolvedDefaultFeatures = [ "alloc" "block-buffer" "core-api" "default" "std" ]; }; + "displaydoc" = rec { + crateName = "displaydoc"; + version = "0.2.5"; + edition = "2021"; + sha256 = "1q0alair462j21iiqwrr21iabkfnb13d6x5w95lkdg21q2xrqdlp"; + procMacro = true; + authors = [ + "Jane Lusby " + ]; + dependencies = [ + { + name = "proc-macro2"; + packageId = "proc-macro2"; + } + { + name = "quote"; + packageId = "quote"; + } + { + name = "syn"; + packageId = "syn 2.0.89"; + } + ]; + features = { + "default" = [ "std" ]; + }; + }; "doc-comment" = rec { crateName = "doc-comment"; version = "0.3.3"; @@ -1522,13 +1579,13 @@ rec { } { name = "syn"; - packageId = "syn 2.0.82"; + packageId = "syn 2.0.89"; } ]; devDependencies = [ { name = "syn"; - packageId = "syn 2.0.82"; + packageId = "syn 2.0.89"; features = [ "full" ]; } ]; @@ -1554,9 +1611,9 @@ rec { }; "encoding_rs" = rec { crateName = "encoding_rs"; - version = "0.8.34"; + version = "0.8.35"; edition = "2018"; - sha256 = "0nagpi1rjqdpvakymwmnlxzq908ncg868lml5b70n08bm82fjpdl"; + sha256 = "1wv64xdrr9v37rqqdjsyb8l8wzlcbab80ryxhrszvnj59wy0y0vm"; authors = [ "Henri Sivonen " ]; @@ -1630,7 +1687,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.82"; + packageId = "syn 2.0.89"; } ]; features = { @@ -1725,7 +1782,7 @@ rec { } { name = "regex-automata"; - packageId = "regex-automata 0.4.8"; + packageId = "regex-automata 0.4.9"; usesDefaultFeatures = false; features = [ "alloc" "syntax" "meta" "nfa" "dfa" "hybrid" ]; } @@ -2002,7 +2059,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.82"; + packageId = "syn 2.0.89"; features = [ "full" ]; } ]; @@ -2312,18 +2369,17 @@ rec { }; resolvedDefaultFeatures = [ "ahash" "allocator-api2" "default" "inline-more" ]; }; - "hashbrown 0.15.0" = rec { + "hashbrown 0.15.2" = rec { crateName = "hashbrown"; - version = "0.15.0"; + version = "0.15.2"; edition = "2021"; - sha256 = "1yx4xq091s7i6mw6bn77k8cp4jrpcac149xr32rg8szqsj27y20y"; + sha256 = "12dj0yfn59p3kh3679ac0w1fagvzf4z2zp87a13gbbqbzw0185dz"; authors = [ "Amanieu d'Antras " ]; features = { "alloc" = [ "dep:alloc" ]; "allocator-api2" = [ "dep:allocator-api2" ]; - "borsh" = [ "dep:borsh" ]; "compiler_builtins" = [ "dep:compiler_builtins" ]; "core" = [ "dep:core" ]; "default" = [ "default-hasher" "inline-more" "allocator-api2" "equivalent" "raw-entry" ]; @@ -2548,9 +2604,9 @@ rec { }; "hyper" = rec { crateName = "hyper"; - version = "1.5.0"; + version = "1.5.1"; edition = "2021"; - sha256 = "16pspkgizcnsr1qcpqvm5l45nfwk7244q9av56cqqwm40slg1gxv"; + sha256 = "07s87id0566m2p5dc5q6nqmxz5r8drqd81b7w4q44djgxwkqi0cp"; authors = [ "Sean McArthur " ]; @@ -2630,7 +2686,7 @@ rec { ]; features = { "client" = [ "dep:want" "dep:pin-project-lite" "dep:smallvec" ]; - "ffi" = [ "dep:libc" "dep:http-body-util" "futures-util?/alloc" ]; + "ffi" = [ "dep:http-body-util" "futures-util?/alloc" ]; "full" = [ "client" "http1" "http2" "server" ]; "http1" = [ "dep:futures-channel" "dep:futures-util" "dep:httparse" "dep:itoa" ]; "http2" = [ "dep:futures-channel" "dep:futures-util" "dep:h2" ]; @@ -2776,7 +2832,7 @@ rec { } { name = "rustls-native-certs"; - packageId = "rustls-native-certs 0.8.0"; + packageId = "rustls-native-certs 0.8.1"; optional = true; } { @@ -2837,9 +2893,9 @@ rec { }; "hyper-timeout" = rec { crateName = "hyper-timeout"; - version = "0.5.1"; + version = "0.5.2"; edition = "2018"; - sha256 = "14rpyv9zz0ncadn9qgmnjz0hiqk3nav7hglkk1a6yfy8wmhsj0rj"; + sha256 = "1c431l5ckr698248yd6bnsmizjy2m1da02cbpmsnmkpvpxkdb41b"; libName = "hyper_timeout"; authors = [ "Herman J. Radtke III " @@ -2873,6 +2929,11 @@ rec { packageId = "hyper"; features = [ "http1" ]; } + { + name = "hyper-util"; + packageId = "hyper-util"; + features = [ "client-legacy" "http1" "server" "server-graceful" ]; + } { name = "tokio"; packageId = "tokio"; @@ -2883,9 +2944,9 @@ rec { }; "hyper-util" = rec { crateName = "hyper-util"; - version = "0.1.9"; + version = "0.1.10"; edition = "2021"; - sha256 = "12yhradh0bpwa9jjyyq6shrrcx9fxbdkrq06xj7ccfhqkyq6waa1"; + sha256 = "1d1iwrkysjhq63pg54zk3vfby1j7zmxzm9zzyfr4lwvp0szcybfz"; libName = "hyper_util"; authors = [ "Sean McArthur " @@ -3039,6 +3100,412 @@ rec { } ]; + }; + "icu_collections" = rec { + crateName = "icu_collections"; + version = "1.5.0"; + edition = "2021"; + sha256 = "09j5kskirl59mvqc8kabhy7005yyy7dp88jw9f6f3gkf419a8byv"; + authors = [ + "The ICU4X Project Developers" + ]; + dependencies = [ + { + name = "displaydoc"; + packageId = "displaydoc"; + usesDefaultFeatures = false; + } + { + name = "yoke"; + packageId = "yoke"; + usesDefaultFeatures = false; + features = [ "derive" ]; + } + { + name = "zerofrom"; + packageId = "zerofrom"; + usesDefaultFeatures = false; + features = [ "derive" ]; + } + { + name = "zerovec"; + packageId = "zerovec"; + usesDefaultFeatures = false; + features = [ "derive" "yoke" ]; + } + ]; + features = { + "databake" = [ "dep:databake" "zerovec/databake" ]; + "serde" = [ "dep:serde" "zerovec/serde" ]; + }; + }; + "icu_locid" = rec { + crateName = "icu_locid"; + version = "1.5.0"; + edition = "2021"; + sha256 = "0dznvd1c5b02iilqm044q4hvar0sqibq1z46prqwjzwif61vpb0k"; + authors = [ + "The ICU4X Project Developers" + ]; + dependencies = [ + { + name = "displaydoc"; + packageId = "displaydoc"; + usesDefaultFeatures = false; + } + { + name = "litemap"; + packageId = "litemap"; + usesDefaultFeatures = false; + features = [ "alloc" ]; + } + { + name = "tinystr"; + packageId = "tinystr"; + usesDefaultFeatures = false; + features = [ "alloc" ]; + } + { + name = "writeable"; + packageId = "writeable"; + usesDefaultFeatures = false; + } + { + name = "zerovec"; + packageId = "zerovec"; + optional = true; + usesDefaultFeatures = false; + } + ]; + features = { + "bench" = [ "serde" ]; + "databake" = [ "dep:databake" ]; + "serde" = [ "dep:serde" "tinystr/serde" ]; + "zerovec" = [ "dep:zerovec" ]; + }; + resolvedDefaultFeatures = [ "zerovec" ]; + }; + "icu_locid_transform" = rec { + crateName = "icu_locid_transform"; + version = "1.5.0"; + edition = "2021"; + sha256 = "0kmmi1kmj9yph6mdgkc7v3wz6995v7ly3n80vbg0zr78bp1iml81"; + authors = [ + "The ICU4X Project Developers" + ]; + dependencies = [ + { + name = "displaydoc"; + packageId = "displaydoc"; + usesDefaultFeatures = false; + } + { + name = "icu_locid"; + packageId = "icu_locid"; + usesDefaultFeatures = false; + features = [ "zerovec" ]; + } + { + name = "icu_locid_transform_data"; + packageId = "icu_locid_transform_data"; + optional = true; + usesDefaultFeatures = false; + } + { + name = "icu_provider"; + packageId = "icu_provider"; + usesDefaultFeatures = false; + features = [ "macros" ]; + } + { + name = "tinystr"; + packageId = "tinystr"; + usesDefaultFeatures = false; + features = [ "alloc" "zerovec" ]; + } + { + name = "zerovec"; + packageId = "zerovec"; + usesDefaultFeatures = false; + features = [ "yoke" ]; + } + ]; + features = { + "bench" = [ "serde" ]; + "compiled_data" = [ "dep:icu_locid_transform_data" ]; + "datagen" = [ "serde" "dep:databake" "zerovec/databake" "icu_locid/databake" "tinystr/databake" ]; + "default" = [ "compiled_data" ]; + "serde" = [ "dep:serde" "icu_locid/serde" "tinystr/serde" "zerovec/serde" "icu_provider/serde" ]; + }; + resolvedDefaultFeatures = [ "compiled_data" ]; + }; + "icu_locid_transform_data" = rec { + crateName = "icu_locid_transform_data"; + version = "1.5.0"; + edition = "2021"; + sha256 = "0vkgjixm0wzp2n3v5mw4j89ly05bg3lx96jpdggbwlpqi0rzzj7x"; + authors = [ + "The ICU4X Project Developers" + ]; + + }; + "icu_normalizer" = rec { + crateName = "icu_normalizer"; + version = "1.5.0"; + edition = "2021"; + sha256 = "0kx8qryp8ma8fw1vijbgbnf7zz9f2j4d14rw36fmjs7cl86kxkhr"; + authors = [ + "The ICU4X Project Developers" + ]; + dependencies = [ + { + name = "displaydoc"; + packageId = "displaydoc"; + usesDefaultFeatures = false; + } + { + name = "icu_collections"; + packageId = "icu_collections"; + usesDefaultFeatures = false; + } + { + name = "icu_normalizer_data"; + packageId = "icu_normalizer_data"; + optional = true; + usesDefaultFeatures = false; + } + { + name = "icu_properties"; + packageId = "icu_properties"; + usesDefaultFeatures = false; + } + { + name = "icu_provider"; + packageId = "icu_provider"; + usesDefaultFeatures = false; + features = [ "macros" ]; + } + { + name = "smallvec"; + packageId = "smallvec"; + usesDefaultFeatures = false; + } + { + name = "utf16_iter"; + packageId = "utf16_iter"; + usesDefaultFeatures = false; + } + { + name = "utf8_iter"; + packageId = "utf8_iter"; + usesDefaultFeatures = false; + } + { + name = "write16"; + packageId = "write16"; + usesDefaultFeatures = false; + features = [ "alloc" ]; + } + { + name = "zerovec"; + packageId = "zerovec"; + usesDefaultFeatures = false; + } + ]; + devDependencies = [ + { + name = "write16"; + packageId = "write16"; + usesDefaultFeatures = false; + features = [ "arrayvec" ]; + } + ]; + features = { + "compiled_data" = [ "dep:icu_normalizer_data" "icu_properties/compiled_data" ]; + "datagen" = [ "serde" "dep:databake" "icu_collections/databake" "zerovec/databake" "icu_properties/datagen" ]; + "default" = [ "compiled_data" ]; + "serde" = [ "dep:serde" "icu_collections/serde" "zerovec/serde" "icu_properties/serde" ]; + "std" = [ "icu_collections/std" "icu_properties/std" "icu_provider/std" ]; + }; + resolvedDefaultFeatures = [ "compiled_data" "default" ]; + }; + "icu_normalizer_data" = rec { + crateName = "icu_normalizer_data"; + version = "1.5.0"; + edition = "2021"; + sha256 = "05lmk0zf0q7nzjnj5kbmsigj3qgr0rwicnn5pqi9n7krmbvzpjpq"; + authors = [ + "The ICU4X Project Developers" + ]; + + }; + "icu_properties" = rec { + crateName = "icu_properties"; + version = "1.5.1"; + edition = "2021"; + sha256 = "1xgf584rx10xc1p7zjr78k0n4zn3g23rrg6v2ln31ingcq3h5mlk"; + authors = [ + "The ICU4X Project Developers" + ]; + dependencies = [ + { + name = "displaydoc"; + packageId = "displaydoc"; + usesDefaultFeatures = false; + } + { + name = "icu_collections"; + packageId = "icu_collections"; + usesDefaultFeatures = false; + } + { + name = "icu_locid_transform"; + packageId = "icu_locid_transform"; + optional = true; + usesDefaultFeatures = false; + features = [ "compiled_data" ]; + } + { + name = "icu_properties_data"; + packageId = "icu_properties_data"; + optional = true; + usesDefaultFeatures = false; + } + { + name = "icu_provider"; + packageId = "icu_provider"; + usesDefaultFeatures = false; + features = [ "macros" ]; + } + { + name = "tinystr"; + packageId = "tinystr"; + usesDefaultFeatures = false; + features = [ "alloc" "zerovec" ]; + } + { + name = "zerovec"; + packageId = "zerovec"; + usesDefaultFeatures = false; + features = [ "derive" ]; + } + ]; + features = { + "bidi" = [ "dep:unicode-bidi" ]; + "compiled_data" = [ "dep:icu_properties_data" "dep:icu_locid_transform" ]; + "datagen" = [ "serde" "dep:databake" "zerovec/databake" "icu_collections/databake" "tinystr/databake" ]; + "default" = [ "compiled_data" ]; + "serde" = [ "dep:serde" "tinystr/serde" "zerovec/serde" "icu_collections/serde" "icu_provider/serde" ]; + "std" = [ "icu_collections/std" "icu_provider/std" ]; + }; + resolvedDefaultFeatures = [ "compiled_data" "default" ]; + }; + "icu_properties_data" = rec { + crateName = "icu_properties_data"; + version = "1.5.0"; + edition = "2021"; + sha256 = "0scms7pd5a7yxx9hfl167f5qdf44as6r3bd8myhlngnxqgxyza37"; + authors = [ + "The ICU4X Project Developers" + ]; + + }; + "icu_provider" = rec { + crateName = "icu_provider"; + version = "1.5.0"; + edition = "2021"; + sha256 = "1nb8vvgw8dv2inqklvk05fs0qxzkw8xrg2n9vgid6y7gm3423m3f"; + authors = [ + "The ICU4X Project Developers" + ]; + dependencies = [ + { + name = "displaydoc"; + packageId = "displaydoc"; + usesDefaultFeatures = false; + } + { + name = "icu_locid"; + packageId = "icu_locid"; + usesDefaultFeatures = false; + } + { + name = "icu_provider_macros"; + packageId = "icu_provider_macros"; + optional = true; + usesDefaultFeatures = false; + } + { + name = "stable_deref_trait"; + packageId = "stable_deref_trait"; + usesDefaultFeatures = false; + } + { + name = "tinystr"; + packageId = "tinystr"; + usesDefaultFeatures = false; + } + { + name = "writeable"; + packageId = "writeable"; + usesDefaultFeatures = false; + } + { + name = "yoke"; + packageId = "yoke"; + usesDefaultFeatures = false; + features = [ "alloc" "derive" ]; + } + { + name = "zerofrom"; + packageId = "zerofrom"; + usesDefaultFeatures = false; + features = [ "alloc" "derive" ]; + } + { + name = "zerovec"; + packageId = "zerovec"; + usesDefaultFeatures = false; + features = [ "derive" ]; + } + ]; + features = { + "datagen" = [ "serde" "dep:erased-serde" "dep:databake" "std" "sync" ]; + "deserialize_bincode_1" = [ "serde" "dep:bincode" "std" ]; + "deserialize_json" = [ "serde" "dep:serde_json" ]; + "deserialize_postcard_1" = [ "serde" "dep:postcard" ]; + "log_error_context" = [ "logging" ]; + "logging" = [ "dep:log" ]; + "macros" = [ "dep:icu_provider_macros" ]; + "serde" = [ "dep:serde" "yoke/serde" ]; + "std" = [ "icu_locid/std" ]; + }; + resolvedDefaultFeatures = [ "macros" ]; + }; + "icu_provider_macros" = rec { + crateName = "icu_provider_macros"; + version = "1.5.0"; + edition = "2021"; + sha256 = "1mjs0w7fcm2lcqmbakhninzrjwqs485lkps4hz0cv3k36y9rxj0y"; + procMacro = true; + authors = [ + "The ICU4X Project Developers" + ]; + dependencies = [ + { + name = "proc-macro2"; + packageId = "proc-macro2"; + } + { + name = "quote"; + packageId = "quote"; + } + { + name = "syn"; + packageId = "syn 2.0.89"; + } + ]; + }; "ident_case" = rec { crateName = "ident_case"; @@ -3052,30 +3519,56 @@ rec { }; "idna" = rec { crateName = "idna"; - version = "0.5.0"; + version = "1.0.3"; edition = "2018"; - sha256 = "1xhjrcjqq0l5bpzvdgylvpkgk94panxgsirzhjnnqfdgc4a9nkb3"; + sha256 = "0zlajvm2k3wy0ay8plr07w22hxkkmrxkffa6ah57ac6nci984vv8"; authors = [ "The rust-url developers" ]; dependencies = [ { - name = "unicode-bidi"; - packageId = "unicode-bidi"; - usesDefaultFeatures = false; - features = [ "hardcoded-data" ]; + name = "idna_adapter"; + packageId = "idna_adapter"; } { - name = "unicode-normalization"; - packageId = "unicode-normalization"; - usesDefaultFeatures = false; + name = "smallvec"; + packageId = "smallvec"; + features = [ "const_generics" ]; + } + { + name = "utf8_iter"; + packageId = "utf8_iter"; } ]; features = { - "default" = [ "std" ]; - "std" = [ "alloc" "unicode-bidi/std" "unicode-normalization/std" ]; + "compiled_data" = [ "idna_adapter/compiled_data" ]; + "default" = [ "std" "compiled_data" ]; + "std" = [ "alloc" ]; }; - resolvedDefaultFeatures = [ "alloc" "default" "std" ]; + resolvedDefaultFeatures = [ "alloc" "compiled_data" "std" ]; + }; + "idna_adapter" = rec { + crateName = "idna_adapter"; + version = "1.2.0"; + edition = "2021"; + sha256 = "0wggnkiivaj5lw0g0384ql2d7zk4ppkn3b1ry4n0ncjpr7qivjns"; + authors = [ + "The rust-url developers" + ]; + dependencies = [ + { + name = "icu_normalizer"; + packageId = "icu_normalizer"; + } + { + name = "icu_properties"; + packageId = "icu_properties"; + } + ]; + features = { + "compiled_data" = [ "icu_normalizer/compiled_data" "icu_properties/compiled_data" ]; + }; + resolvedDefaultFeatures = [ "compiled_data" ]; }; "indexmap" = rec { crateName = "indexmap"; @@ -3090,7 +3583,7 @@ rec { } { name = "hashbrown"; - packageId = "hashbrown 0.15.0"; + packageId = "hashbrown 0.15.2"; usesDefaultFeatures = false; } ]; @@ -3166,9 +3659,9 @@ rec { }; "itoa" = rec { crateName = "itoa"; - version = "1.0.11"; + version = "1.0.13"; edition = "2018"; - sha256 = "0nv9cqjwzr3q58qz84dcz63ggc54yhf1yqar1m858m1kfd4g3wa9"; + sha256 = "1wjf22cawbrf26zjnflhg9aqjpf9gccgyc6djaj70i1zgblm81jl"; authors = [ "David Tolnay " ]; @@ -3829,7 +4322,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.82"; + packageId = "syn 2.0.89"; features = [ "extra-traits" ]; } ]; @@ -3973,9 +4466,9 @@ rec { }; "libc" = rec { crateName = "libc"; - version = "0.2.161"; + version = "0.2.164"; edition = "2015"; - sha256 = "1lc5s3zd0491x9zxrv2kvclai1my1spz950pkkyry4vwh318k54f"; + sha256 = "0gy1yzvc6x760r9zfkhl1f7p91zz559nxspvwfrajpf7p03gwfs3"; authors = [ "The Rust Project Developers" ]; @@ -4073,6 +4566,24 @@ rec { }; resolvedDefaultFeatures = [ "libc" ]; }; + "litemap" = rec { + crateName = "litemap"; + version = "0.7.4"; + edition = "2021"; + sha256 = "012ili3vppd4952sh6y3qwcd0jkd0bq2qpr9h7cppc8sj11k7saf"; + authors = [ + "The ICU4X Project Developers" + ]; + features = { + "bench" = [ "serde" ]; + "databake" = [ "dep:databake" ]; + "default" = [ "alloc" ]; + "serde" = [ "dep:serde" ]; + "testing" = [ "alloc" ]; + "yoke" = [ "dep:yoke" ]; + }; + resolvedDefaultFeatures = [ "alloc" ]; + }; "lock_api" = rec { crateName = "lock_api"; version = "0.4.12"; @@ -4442,7 +4953,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.82"; + packageId = "syn 2.0.89"; features = [ "full" ]; } ]; @@ -4687,7 +5198,7 @@ rec { } { name = "ordered-float"; - packageId = "ordered-float 4.4.0"; + packageId = "ordered-float 4.5.0"; } { name = "percent-encoding"; @@ -4775,11 +5286,11 @@ rec { }; resolvedDefaultFeatures = [ "default" "std" ]; }; - "ordered-float 4.4.0" = rec { + "ordered-float 4.5.0" = rec { crateName = "ordered-float"; - version = "4.4.0"; + version = "4.5.0"; edition = "2021"; - sha256 = "15vbmn4lvd2gjmb1s2hbr4n18plk1pql9md30sapq2r4bswwrrw3"; + sha256 = "0ppqpjrri5r5vdz06na24d00cjaz67ambd1hcq13iy8vf3wy2pn6"; libName = "ordered_float"; authors = [ "Jonathan Reem " @@ -5039,7 +5550,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.82"; + packageId = "syn 2.0.89"; } ]; features = { @@ -5082,9 +5593,9 @@ rec { }; "pin-project" = rec { crateName = "pin-project"; - version = "1.1.6"; + version = "1.1.7"; edition = "2021"; - sha256 = "1v4924b870bss0x5ahww9a164d4dbny90vzkmljfbqfxc6hj7wds"; + sha256 = "15cvflrzsgp1zbl5gv37al2r62nl8lc37xkfwf70ql3fji7gcmxy"; libName = "pin_project"; dependencies = [ { @@ -5096,9 +5607,9 @@ rec { }; "pin-project-internal" = rec { crateName = "pin-project-internal"; - version = "1.1.6"; + version = "1.1.7"; edition = "2021"; - sha256 = "1y2pjavbcq40njylbnw3929i8nnrcdzrhgalzgqk57ya2n2jsl54"; + sha256 = "133mxf5vmvnvw4idw2y2lb5bxsza2xlyfl6psjy7mz3l12nmy3rw"; procMacro = true; libName = "pin_project_internal"; dependencies = [ @@ -5112,7 +5623,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.82"; + packageId = "syn 2.0.89"; usesDefaultFeatures = false; features = [ "parsing" "printing" "clone-impls" "proc-macro" "full" "visit-mut" ]; } @@ -5121,9 +5632,9 @@ rec { }; "pin-project-lite" = rec { crateName = "pin-project-lite"; - version = "0.2.14"; + version = "0.2.15"; edition = "2018"; - sha256 = "00nx3f04agwjlsmd3mc5rx5haibj2v8q9b52b0kwn63wcv4nz9mx"; + sha256 = "1zz4xif3iknfrpmvqmh0pcc9mx4cxm28jywqydir3pimcla1wnli"; libName = "pin_project_lite"; }; @@ -5203,9 +5714,9 @@ rec { }; "proc-macro2" = rec { crateName = "proc-macro2"; - version = "1.0.89"; + version = "1.0.92"; edition = "2021"; - sha256 = "0vlq56v41dsj69pnk7lil7fxvbfid50jnzdn3xnr31g05mkb0fgi"; + sha256 = "1c1vjy5wg8iy7kxsxda564qf4ljp0asysmbn2i7caj177x5m9lrp"; libName = "proc_macro2"; authors = [ "David Tolnay " @@ -5420,9 +5931,9 @@ rec { }; "regex" = rec { crateName = "regex"; - version = "1.11.0"; + version = "1.11.1"; edition = "2021"; - sha256 = "1n5imk7yxam409ik5nagsjpwqvbg3f0g0mznd5drf549x1g0w81q"; + sha256 = "148i41mzbx8bmq32hsj1q4karkzzx5m60qza6gdw4pdc9qdyyi5m"; authors = [ "The Rust Project Developers" "Andrew Gallant " @@ -5442,7 +5953,7 @@ rec { } { name = "regex-automata"; - packageId = "regex-automata 0.4.8"; + packageId = "regex-automata 0.4.9"; usesDefaultFeatures = false; features = [ "alloc" "syntax" "meta" "nfa-pikevm" ]; } @@ -5501,11 +6012,11 @@ rec { }; resolvedDefaultFeatures = [ "default" "regex-syntax" "std" ]; }; - "regex-automata 0.4.8" = rec { + "regex-automata 0.4.9" = rec { crateName = "regex-automata"; - version = "0.4.8"; + version = "0.4.9"; edition = "2021"; - sha256 = "18wd530ndrmygi6xnz3sp345qi0hy2kdbsa89182nwbl6br5i1rn"; + sha256 = "02092l8zfh3vkmk47yjc8d631zhhcd49ck2zr133prvd3z38v7l0"; libName = "regex_automata"; authors = [ "The Rust Project Developers" @@ -5752,7 +6263,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.82"; + packageId = "syn 2.0.89"; features = [ "full" "parsing" "extra-traits" "visit" "visit-mut" ]; } { @@ -5802,9 +6313,9 @@ rec { }; "rustls" = rec { crateName = "rustls"; - version = "0.23.15"; + version = "0.23.18"; edition = "2021"; - sha256 = "14vr5pfdvzfcqrmjzh1834a1nyi3kzv7j8s22gb77s64mkbl9fsz"; + sha256 = "0zxbcq0qy3kmp0m42mmf930h5bhr3hh3ivamrrd6ag94gvac374w"; dependencies = [ { name = "log"; @@ -5896,17 +6407,17 @@ rec { } { name = "security-framework"; - packageId = "security-framework"; + packageId = "security-framework 2.11.1"; target = { target, features }: ("macos" == target."os" or null); } ]; }; - "rustls-native-certs 0.8.0" = rec { + "rustls-native-certs 0.8.1" = rec { crateName = "rustls-native-certs"; - version = "0.8.0"; + version = "0.8.1"; edition = "2021"; - sha256 = "12izz1ahwj3yr9fkd39q1w535577z9wsapsahz6jcwxyyaj1ibzw"; + sha256 = "1ls7laa3748mkn23fmi3g4mlwk131lx6chq2lyc8v2mmabfz5kvz"; libName = "rustls_native_certs"; dependencies = [ { @@ -5914,14 +6425,11 @@ rec { packageId = "openssl-probe"; target = { target, features }: ((target."unix" or false) && (!("macos" == target."os" or null))); } - { - name = "rustls-pemfile"; - packageId = "rustls-pemfile"; - } { name = "rustls-pki-types"; packageId = "rustls-pki-types"; rename = "pki-types"; + features = [ "std" ]; } { name = "schannel"; @@ -5930,7 +6438,7 @@ rec { } { name = "security-framework"; - packageId = "security-framework"; + packageId = "security-framework 3.0.1"; target = { target, features }: ("macos" == target."os" or null); } ]; @@ -6028,9 +6536,9 @@ rec { }; "schannel" = rec { crateName = "schannel"; - version = "0.1.26"; + version = "0.1.27"; edition = "2018"; - sha256 = "1hfip5mdwqcfnmrnkrq9d8zwy6bssmf6rfm2441nk83ghbjpn8h1"; + sha256 = "0gbbhy28v72kd5iina0z2vcdl3vz63mk5idvkzn5r52z6jmfna8z"; authors = [ "Steven Fackler " "Steffen Butzer " @@ -6141,7 +6649,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.82"; + packageId = "syn 2.0.89"; features = [ "extra-traits" ]; } ]; @@ -6179,11 +6687,58 @@ rec { "serde" = [ "dep:serde" ]; }; }; - "security-framework" = rec { + "security-framework 2.11.1" = rec { crateName = "security-framework"; version = "2.11.1"; edition = "2021"; - sha256 = "00ldclwx78dm61v7wkach9lcx76awlrv0fdgjdwch4dmy12j4yw9"; + sha256 = "00ldclwx78dm61v7wkach9lcx76awlrv0fdgjdwch4dmy12j4yw9"; + libName = "security_framework"; + authors = [ + "Steven Fackler " + "Kornel " + ]; + dependencies = [ + { + name = "bitflags"; + packageId = "bitflags 2.6.0"; + } + { + name = "core-foundation"; + packageId = "core-foundation 0.9.4"; + } + { + name = "core-foundation-sys"; + packageId = "core-foundation-sys"; + } + { + name = "libc"; + packageId = "libc"; + } + { + name = "security-framework-sys"; + packageId = "security-framework-sys"; + usesDefaultFeatures = false; + } + ]; + features = { + "OSX_10_10" = [ "OSX_10_9" "security-framework-sys/OSX_10_10" ]; + "OSX_10_11" = [ "OSX_10_10" "security-framework-sys/OSX_10_11" ]; + "OSX_10_12" = [ "OSX_10_11" "security-framework-sys/OSX_10_12" ]; + "OSX_10_13" = [ "OSX_10_12" "security-framework-sys/OSX_10_13" "alpn" "session-tickets" "serial-number-bigint" ]; + "OSX_10_14" = [ "OSX_10_13" "security-framework-sys/OSX_10_14" ]; + "OSX_10_15" = [ "OSX_10_14" "security-framework-sys/OSX_10_15" ]; + "OSX_10_9" = [ "security-framework-sys/OSX_10_9" ]; + "default" = [ "OSX_10_12" ]; + "log" = [ "dep:log" ]; + "serial-number-bigint" = [ "dep:num-bigint" ]; + }; + resolvedDefaultFeatures = [ "OSX_10_10" "OSX_10_11" "OSX_10_12" "OSX_10_9" "default" ]; + }; + "security-framework 3.0.1" = rec { + crateName = "security-framework"; + version = "3.0.1"; + edition = "2021"; + sha256 = "1j1rpyiwq698dyyq2lnnws8hzknw8r32dy9cx9jc7gljgrh5lhg1"; libName = "security_framework"; authors = [ "Steven Fackler " @@ -6196,7 +6751,7 @@ rec { } { name = "core-foundation"; - packageId = "core-foundation"; + packageId = "core-foundation 0.10.0"; } { name = "core-foundation-sys"; @@ -6213,24 +6768,20 @@ rec { } ]; features = { - "OSX_10_10" = [ "OSX_10_9" "security-framework-sys/OSX_10_10" ]; - "OSX_10_11" = [ "OSX_10_10" "security-framework-sys/OSX_10_11" ]; - "OSX_10_12" = [ "OSX_10_11" "security-framework-sys/OSX_10_12" ]; - "OSX_10_13" = [ "OSX_10_12" "security-framework-sys/OSX_10_13" "alpn" "session-tickets" "serial-number-bigint" ]; + "OSX_10_12" = [ "security-framework-sys/OSX_10_12" ]; + "OSX_10_13" = [ "OSX_10_12" "security-framework-sys/OSX_10_13" "alpn" "session-tickets" ]; "OSX_10_14" = [ "OSX_10_13" "security-framework-sys/OSX_10_14" ]; "OSX_10_15" = [ "OSX_10_14" "security-framework-sys/OSX_10_15" ]; - "OSX_10_9" = [ "security-framework-sys/OSX_10_9" ]; "default" = [ "OSX_10_12" ]; "log" = [ "dep:log" ]; - "serial-number-bigint" = [ "dep:num-bigint" ]; }; - resolvedDefaultFeatures = [ "OSX_10_10" "OSX_10_11" "OSX_10_12" "OSX_10_9" "default" ]; + resolvedDefaultFeatures = [ "OSX_10_12" "default" ]; }; "security-framework-sys" = rec { crateName = "security-framework-sys"; - version = "2.12.0"; + version = "2.12.1"; edition = "2021"; - sha256 = "1dml0lp9lrvvi01s011lyss5kzzsmakaamdwsxr0431jd4l2jjpa"; + sha256 = "18pafp0bn41bcbm66qrhb3pg4c8dddvc28jdr51mb2y57lqcffgs"; libName = "security_framework_sys"; authors = [ "Steven Fackler " @@ -6273,9 +6824,9 @@ rec { }; "serde" = rec { crateName = "serde"; - version = "1.0.213"; + version = "1.0.215"; edition = "2018"; - sha256 = "1hcv1q7ziy27c2awc0lnhigjj6rli1863fr0szw6sip2ylzqk9ry"; + sha256 = "13xqkw93cw9rnbkm0zy1apnilzq7l2xf1qw8m1nkga8i1fnw24v5"; authors = [ "Erick Tryzelaar " "David Tolnay " @@ -6328,9 +6879,9 @@ rec { }; "serde_derive" = rec { crateName = "serde_derive"; - version = "1.0.213"; + version = "1.0.215"; edition = "2015"; - sha256 = "198g92m9c8whvwrnrbxppwdm3pvbq7ddd35agkl5h2y514hav1by"; + sha256 = "1h2nswy0rmzblil38h12wxsgni1ik63rk22wy19g48v9hrpqc7md"; procMacro = true; authors = [ "Erick Tryzelaar " @@ -6351,7 +6902,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.82"; + packageId = "syn 2.0.89"; usesDefaultFeatures = false; features = [ "clone-impls" "derive" "parsing" "printing" "proc-macro" ]; } @@ -6383,7 +6934,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.82"; + packageId = "syn 2.0.89"; usesDefaultFeatures = false; features = [ "clone-impls" "derive" "parsing" "printing" ]; } @@ -6392,9 +6943,9 @@ rec { }; "serde_json" = rec { crateName = "serde_json"; - version = "1.0.132"; + version = "1.0.133"; edition = "2021"; - sha256 = "00yv8vyn1qiplziswm1vwam4a0xs1rfr162q75njc85kyjpvy9np"; + sha256 = "0xz3bswa527wln3fy0qb7y081nx3cp5yy1ggjhi6n5mrfcjfpz67"; authors = [ "Erick Tryzelaar " "David Tolnay " @@ -6755,7 +7306,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.82"; + packageId = "syn 2.0.89"; features = [ "full" ]; } ]; @@ -6814,6 +7365,20 @@ rec { }; resolvedDefaultFeatures = [ "once" ]; }; + "stable_deref_trait" = rec { + crateName = "stable_deref_trait"; + version = "1.2.0"; + edition = "2015"; + sha256 = "1lxjr8q2n534b2lhkxd6l6wcddzjvnksi58zv11f9y0jjmr15wd8"; + authors = [ + "Robert Grosse " + ]; + features = { + "default" = [ "std" ]; + "std" = [ "alloc" ]; + }; + resolvedDefaultFeatures = [ "alloc" ]; + }; "stackable-druid-crd" = rec { crateName = "stackable-druid-crd"; version = "0.0.0-dev"; @@ -6990,13 +7555,13 @@ rec { }; "stackable-operator" = rec { crateName = "stackable-operator"; - version = "0.80.0"; + version = "0.82.0"; edition = "2021"; workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "6fbe32300b60f95e0baa2ab0ff2daf961b06531c"; - sha256 = "16jrq3wdwz63210jgmqbx3snrr15wxw6l1smqhzv7b7jpq8qvya3"; + rev = "415bbd031bd52e9c0c5392060235030e9930b46b"; + sha256 = "0phasjwb64rxgn5hs8vks92icmx9255bd5v9dms280clrfpcg4hy"; }; libName = "stackable_operator"; authors = [ @@ -7153,8 +7718,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "6fbe32300b60f95e0baa2ab0ff2daf961b06531c"; - sha256 = "16jrq3wdwz63210jgmqbx3snrr15wxw6l1smqhzv7b7jpq8qvya3"; + rev = "415bbd031bd52e9c0c5392060235030e9930b46b"; + sha256 = "0phasjwb64rxgn5hs8vks92icmx9255bd5v9dms280clrfpcg4hy"; }; procMacro = true; libName = "stackable_operator_derive"; @@ -7176,7 +7741,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.82"; + packageId = "syn 2.0.89"; } ]; @@ -7188,8 +7753,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "6fbe32300b60f95e0baa2ab0ff2daf961b06531c"; - sha256 = "16jrq3wdwz63210jgmqbx3snrr15wxw6l1smqhzv7b7jpq8qvya3"; + rev = "415bbd031bd52e9c0c5392060235030e9930b46b"; + sha256 = "0phasjwb64rxgn5hs8vks92icmx9255bd5v9dms280clrfpcg4hy"; }; libName = "stackable_shared"; authors = [ @@ -7290,7 +7855,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.82"; + packageId = "syn 2.0.89"; features = [ "parsing" "extra-traits" ]; } ]; @@ -7343,11 +7908,11 @@ rec { }; resolvedDefaultFeatures = [ "clone-impls" "default" "derive" "extra-traits" "full" "parsing" "printing" "proc-macro" "quote" "visit" ]; }; - "syn 2.0.82" = rec { + "syn 2.0.89" = rec { crateName = "syn"; - version = "2.0.82"; + version = "2.0.89"; edition = "2021"; - sha256 = "08g0bgizm4j2gwl05r3yjm3gxvx8a9dvkvd84fa03z4aga1hym43"; + sha256 = "0kicx48gndpxkkqnpv89f1slrzzbyldhr8nyhk6pmj61y6169m24"; authors = [ "David Tolnay " ]; @@ -7374,7 +7939,7 @@ rec { "proc-macro" = [ "proc-macro2/proc-macro" "quote?/proc-macro" ]; "test" = [ "syn-test-suite/all-features" ]; }; - resolvedDefaultFeatures = [ "clone-impls" "default" "derive" "extra-traits" "full" "parsing" "printing" "proc-macro" "visit" "visit-mut" ]; + resolvedDefaultFeatures = [ "clone-impls" "default" "derive" "extra-traits" "fold" "full" "parsing" "printing" "proc-macro" "visit" "visit-mut" ]; }; "sync_wrapper" = rec { crateName = "sync_wrapper"; @@ -7389,11 +7954,43 @@ rec { "futures-core" = [ "dep:futures-core" ]; }; }; + "synstructure" = rec { + crateName = "synstructure"; + version = "0.13.1"; + edition = "2018"; + sha256 = "0wc9f002ia2zqcbj0q2id5x6n7g1zjqba7qkg2mr0qvvmdk7dby8"; + authors = [ + "Nika Layzell " + ]; + dependencies = [ + { + name = "proc-macro2"; + packageId = "proc-macro2"; + usesDefaultFeatures = false; + } + { + name = "quote"; + packageId = "quote"; + usesDefaultFeatures = false; + } + { + name = "syn"; + packageId = "syn 2.0.89"; + usesDefaultFeatures = false; + features = [ "derive" "parsing" "printing" "clone-impls" "visit" "extra-traits" ]; + } + ]; + features = { + "default" = [ "proc-macro" ]; + "proc-macro" = [ "proc-macro2/proc-macro" "syn/proc-macro" "quote/proc-macro" ]; + }; + resolvedDefaultFeatures = [ "default" "proc-macro" ]; + }; "thiserror" = rec { crateName = "thiserror"; - version = "1.0.65"; + version = "1.0.69"; edition = "2021"; - sha256 = "1mdkawq9l9p02zvq7y4py739rjk9wk2ha27mbsb3i6sdb7csn4ax"; + sha256 = "0lizjay08agcr5hs9yfzzj6axs53a2rgx070a1dsi3jpkcrzbamn"; authors = [ "David Tolnay " ]; @@ -7407,9 +8004,9 @@ rec { }; "thiserror-impl" = rec { crateName = "thiserror-impl"; - version = "1.0.65"; + version = "1.0.69"; edition = "2021"; - sha256 = "00l6gyrx6qlm1d7if3dcfl2sl0mg8k21caknkpk7glnb481pfwdf"; + sha256 = "1h84fmn2nai41cxbhk6pqf46bxqq1b344v8yz089w1chzi76rvjg"; procMacro = true; libName = "thiserror_impl"; authors = [ @@ -7426,7 +8023,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.82"; + packageId = "syn 2.0.89"; } ]; @@ -7627,47 +8224,40 @@ rec { }; resolvedDefaultFeatures = [ "formatting" "parsing" ]; }; - "tinyvec" = rec { - crateName = "tinyvec"; - version = "1.8.0"; - edition = "2018"; - sha256 = "0f5rf6a2wzyv6w4jmfga9iw7rp9fp5gf4d604xgjsf3d9wgqhpj4"; + "tinystr" = rec { + crateName = "tinystr"; + version = "0.7.6"; + edition = "2021"; + sha256 = "0bxqaw7z8r2kzngxlzlgvld1r6jbnwyylyvyjbv1q71rvgaga5wi"; authors = [ - "Lokathor " + "The ICU4X Project Developers" ]; dependencies = [ { - name = "tinyvec_macros"; - packageId = "tinyvec_macros"; + name = "displaydoc"; + packageId = "displaydoc"; + usesDefaultFeatures = false; + } + { + name = "zerovec"; + packageId = "zerovec"; optional = true; + usesDefaultFeatures = false; } ]; features = { - "alloc" = [ "tinyvec_macros" ]; - "arbitrary" = [ "dep:arbitrary" ]; - "real_blackbox" = [ "criterion/real_blackbox" ]; - "rustc_1_57" = [ "rustc_1_55" ]; + "databake" = [ "dep:databake" ]; + "default" = [ "alloc" ]; "serde" = [ "dep:serde" ]; - "std" = [ "alloc" ]; - "tinyvec_macros" = [ "dep:tinyvec_macros" ]; + "zerovec" = [ "dep:zerovec" ]; }; - resolvedDefaultFeatures = [ "alloc" "default" "tinyvec_macros" ]; - }; - "tinyvec_macros" = rec { - crateName = "tinyvec_macros"; - version = "0.1.1"; - edition = "2018"; - sha256 = "081gag86208sc3y6sdkshgw3vysm5d34p431dzw0bshz66ncng0z"; - authors = [ - "Soveu " - ]; - + resolvedDefaultFeatures = [ "alloc" "zerovec" ]; }; "tokio" = rec { crateName = "tokio"; - version = "1.41.0"; + version = "1.41.1"; edition = "2021"; - sha256 = "1fwb4nm630hmy9cyl2ar6wxqckgvsakwhg1rhjza4is3a09k8pql"; + sha256 = "0csdvrlpz2b0amrsinkq809nkdkvi6ndc94jr8wjk9d6wyzbbkr2"; authors = [ "Tokio Contributors " ]; @@ -7788,7 +8378,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.82"; + packageId = "syn 2.0.89"; features = [ "full" ]; } ]; @@ -8095,9 +8685,9 @@ rec { }; "tower-http" = rec { crateName = "tower-http"; - version = "0.6.1"; + version = "0.6.2"; edition = "2018"; - sha256 = "15yb8rh970ll3yrd3lydshysi0x89bnxbqqrypqcbj5vnq51adw4"; + sha256 = "15wnvhl6cpir9125s73bqjzjsvfb0fmndmsimnl2ddnlhfvs6gs0"; libName = "tower_http"; authors = [ "Tower Maintainers " @@ -8328,7 +8918,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.82"; + packageId = "syn 2.0.89"; usesDefaultFeatures = false; features = [ "full" "parsing" "printing" "visit-mut" "clone-impls" "extra-traits" "proc-macro" ]; } @@ -8691,59 +9281,17 @@ rec { }; resolvedDefaultFeatures = [ "std" ]; }; - "unicode-bidi" = rec { - crateName = "unicode-bidi"; - version = "0.3.17"; - edition = "2018"; - sha256 = "14vqdsnrm3y5anj6h5zz5s32w88crraycblb88d9k23k9ns7vcas"; - libName = "unicode_bidi"; - authors = [ - "The Servo Project Developers" - ]; - features = { - "default" = [ "std" "hardcoded-data" ]; - "flame" = [ "dep:flame" ]; - "flame_it" = [ "flame" "flamer" ]; - "flamer" = [ "dep:flamer" ]; - "serde" = [ "dep:serde" ]; - "smallvec" = [ "dep:smallvec" ]; - "with_serde" = [ "serde" ]; - }; - resolvedDefaultFeatures = [ "hardcoded-data" "std" ]; - }; "unicode-ident" = rec { crateName = "unicode-ident"; - version = "1.0.13"; + version = "1.0.14"; edition = "2018"; - sha256 = "1zm1xylzsdfvm2a5ib9li3g5pp7qnkv4amhspydvgbmd9k6mc6z9"; + sha256 = "10ywa1pg0glgkr4l3dppjxizr9r2b7im0ycbfa0137l69z5fdfdd"; libName = "unicode_ident"; authors = [ "David Tolnay " ]; }; - "unicode-normalization" = rec { - crateName = "unicode-normalization"; - version = "0.1.24"; - edition = "2018"; - sha256 = "0mnrk809z3ix1wspcqy97ld5wxdb31f3xz6nsvg5qcv289ycjcsh"; - libName = "unicode_normalization"; - authors = [ - "kwantam " - "Manish Goregaokar " - ]; - dependencies = [ - { - name = "tinyvec"; - packageId = "tinyvec"; - features = [ "alloc" ]; - } - ]; - features = { - "default" = [ "std" ]; - }; - resolvedDefaultFeatures = [ "std" ]; - }; "unicode-xid" = rec { crateName = "unicode-xid"; version = "0.2.6"; @@ -8783,9 +9331,9 @@ rec { }; "url" = rec { crateName = "url"; - version = "2.5.2"; + version = "2.5.4"; edition = "2018"; - sha256 = "0v2dx50mx7xzl9454cl5qmpjnhkbahmn59gd3apyipbgyyylsy12"; + sha256 = "0q6sgznyy2n4l5lm16zahkisvc9nip9aa5q1pps7656xra3bdy1j"; authors = [ "The rust-url developers" ]; @@ -8793,14 +9341,20 @@ rec { { name = "form_urlencoded"; packageId = "form_urlencoded"; + usesDefaultFeatures = false; + features = [ "alloc" ]; } { name = "idna"; packageId = "idna"; + usesDefaultFeatures = false; + features = [ "alloc" "compiled_data" ]; } { name = "percent-encoding"; packageId = "percent-encoding"; + usesDefaultFeatures = false; + features = [ "alloc" ]; } { name = "serde"; @@ -8817,9 +9371,31 @@ rec { } ]; features = { + "default" = [ "std" ]; "serde" = [ "dep:serde" ]; + "std" = [ "idna/std" "percent-encoding/std" "form_urlencoded/std" ]; }; - resolvedDefaultFeatures = [ "default" "serde" ]; + resolvedDefaultFeatures = [ "default" "serde" "std" ]; + }; + "utf16_iter" = rec { + crateName = "utf16_iter"; + version = "1.0.5"; + edition = "2021"; + sha256 = "0ik2krdr73hfgsdzw0218fn35fa09dg2hvbi1xp3bmdfrp9js8y8"; + authors = [ + "Henri Sivonen " + ]; + + }; + "utf8_iter" = rec { + crateName = "utf8_iter"; + version = "1.0.4"; + edition = "2021"; + sha256 = "1gmna9flnj8dbyd8ba17zigrp9c4c3zclngf5lnb5yvz1ri41hdn"; + authors = [ + "Henri Sivonen " + ]; + }; "utf8parse" = rec { crateName = "utf8parse"; @@ -8967,7 +9543,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.82"; + packageId = "syn 2.0.89"; features = [ "full" ]; } { @@ -9026,7 +9602,7 @@ rec { } { name = "syn"; - packageId = "syn 2.0.82"; + packageId = "syn 2.0.89"; features = [ "visit" "visit-mut" "full" ]; } { @@ -9650,7 +10226,7 @@ rec { "Win32_Web" = [ "Win32" ]; "Win32_Web_InternetExplorer" = [ "Win32_Web" ]; }; - resolvedDefaultFeatures = [ "Win32" "Win32_Foundation" "Win32_Security" "Win32_Security_Authentication" "Win32_Security_Authentication_Identity" "Win32_Security_Credentials" "Win32_Security_Cryptography" "Win32_System" "Win32_System_LibraryLoader" "Win32_System_Memory" "Win32_System_SystemInformation" "default" ]; + resolvedDefaultFeatures = [ "Win32" "Win32_Foundation" "Win32_Security" "Win32_Security_Authentication" "Win32_Security_Authentication_Identity" "Win32_Security_Credentials" "Win32_Security_Cryptography" "Win32_System" "Win32_System_Console" "Win32_System_LibraryLoader" "Win32_System_Memory" "Win32_System_SystemInformation" "default" ]; }; "windows-targets" = rec { crateName = "windows-targets"; @@ -9807,17 +10383,120 @@ rec { }; resolvedDefaultFeatures = [ "alloc" "default" "std" ]; }; + "write16" = rec { + crateName = "write16"; + version = "1.0.0"; + edition = "2021"; + sha256 = "0dnryvrrbrnl7vvf5vb1zkmwldhjkf2n5znliviam7bm4900z2fi"; + features = { + "arrayvec" = [ "dep:arrayvec" ]; + "smallvec" = [ "dep:smallvec" ]; + }; + resolvedDefaultFeatures = [ "alloc" ]; + }; + "writeable" = rec { + crateName = "writeable"; + version = "0.5.5"; + edition = "2021"; + sha256 = "0lawr6y0bwqfyayf3z8zmqlhpnzhdx0ahs54isacbhyjwa7g778y"; + authors = [ + "The ICU4X Project Developers" + ]; + features = { + "either" = [ "dep:either" ]; + }; + }; "xml-rs" = rec { crateName = "xml-rs"; - version = "0.8.22"; + version = "0.8.23"; edition = "2021"; crateBin = []; - sha256 = "09pg779vjh0xp3ph10j4wy1ihz8pzvxm1qf1jqw0jnmsghpjwkmg"; + sha256 = "0vyrvl256gmyj1lixwb8yhjy2ja91cjk1dq2csi4hzlkmvm0scdg"; libName = "xml"; authors = [ "Vladimir Matveev " ]; + }; + "yoke" = rec { + crateName = "yoke"; + version = "0.7.5"; + edition = "2021"; + sha256 = "0h3znzrdmll0a7sglzf9ji0p5iqml11wrj1dypaf6ad6kbpnl3hj"; + authors = [ + "Manish Goregaokar " + ]; + dependencies = [ + { + name = "serde"; + packageId = "serde"; + optional = true; + usesDefaultFeatures = false; + } + { + name = "stable_deref_trait"; + packageId = "stable_deref_trait"; + usesDefaultFeatures = false; + } + { + name = "yoke-derive"; + packageId = "yoke-derive"; + optional = true; + usesDefaultFeatures = false; + } + { + name = "zerofrom"; + packageId = "zerofrom"; + optional = true; + usesDefaultFeatures = false; + } + ]; + devDependencies = [ + { + name = "serde"; + packageId = "serde"; + usesDefaultFeatures = false; + } + ]; + features = { + "alloc" = [ "stable_deref_trait/alloc" "serde?/alloc" "zerofrom/alloc" ]; + "default" = [ "alloc" "zerofrom" ]; + "derive" = [ "dep:yoke-derive" "zerofrom/derive" ]; + "serde" = [ "dep:serde" ]; + "zerofrom" = [ "dep:zerofrom" ]; + }; + resolvedDefaultFeatures = [ "alloc" "default" "derive" "zerofrom" ]; + }; + "yoke-derive" = rec { + crateName = "yoke-derive"; + version = "0.7.5"; + edition = "2021"; + sha256 = "0m4i4a7gy826bfvnqa9wy6sp90qf0as3wps3wb0smjaamn68g013"; + procMacro = true; + libName = "yoke_derive"; + authors = [ + "Manish Goregaokar " + ]; + dependencies = [ + { + name = "proc-macro2"; + packageId = "proc-macro2"; + } + { + name = "quote"; + packageId = "quote"; + } + { + name = "syn"; + packageId = "syn 2.0.89"; + features = [ "fold" ]; + } + { + name = "synstructure"; + packageId = "synstructure"; + } + ]; + }; "zerocopy" = rec { crateName = "zerocopy"; @@ -9882,7 +10561,60 @@ rec { } { name = "syn"; - packageId = "syn 2.0.82"; + packageId = "syn 2.0.89"; + } + ]; + + }; + "zerofrom" = rec { + crateName = "zerofrom"; + version = "0.1.5"; + edition = "2021"; + sha256 = "0bnd8vjcllzrvr3wvn8x14k2hkrpyy1fm3crkn2y3plmr44fxwyg"; + authors = [ + "Manish Goregaokar " + ]; + dependencies = [ + { + name = "zerofrom-derive"; + packageId = "zerofrom-derive"; + optional = true; + usesDefaultFeatures = false; + } + ]; + features = { + "default" = [ "alloc" ]; + "derive" = [ "dep:zerofrom-derive" ]; + }; + resolvedDefaultFeatures = [ "alloc" "derive" ]; + }; + "zerofrom-derive" = rec { + crateName = "zerofrom-derive"; + version = "0.1.5"; + edition = "2021"; + sha256 = "022q55phhb44qbrcfbc48k0b741fl8gnazw3hpmmndbx5ycfspjr"; + procMacro = true; + libName = "zerofrom_derive"; + authors = [ + "Manish Goregaokar " + ]; + dependencies = [ + { + name = "proc-macro2"; + packageId = "proc-macro2"; + } + { + name = "quote"; + packageId = "quote"; + } + { + name = "syn"; + packageId = "syn 2.0.89"; + features = [ "fold" ]; + } + { + name = "synstructure"; + packageId = "synstructure"; } ]; @@ -9904,6 +10636,69 @@ rec { }; resolvedDefaultFeatures = [ "alloc" "default" ]; }; + "zerovec" = rec { + crateName = "zerovec"; + version = "0.10.4"; + edition = "2021"; + sha256 = "0yghix7n3fjfdppwghknzvx9v8cf826h2qal5nqvy8yzg4yqjaxa"; + authors = [ + "The ICU4X Project Developers" + ]; + dependencies = [ + { + name = "yoke"; + packageId = "yoke"; + optional = true; + } + { + name = "zerofrom"; + packageId = "zerofrom"; + usesDefaultFeatures = false; + } + { + name = "zerovec-derive"; + packageId = "zerovec-derive"; + optional = true; + usesDefaultFeatures = false; + } + ]; + features = { + "bench" = [ "serde" "databake" ]; + "databake" = [ "dep:databake" ]; + "derive" = [ "dep:zerovec-derive" ]; + "hashmap" = [ "dep:twox-hash" ]; + "serde" = [ "dep:serde" ]; + "yoke" = [ "dep:yoke" ]; + }; + resolvedDefaultFeatures = [ "derive" "yoke" ]; + }; + "zerovec-derive" = rec { + crateName = "zerovec-derive"; + version = "0.10.3"; + edition = "2021"; + sha256 = "1ik322dys6wnap5d3gcsn09azmssq466xryn5czfm13mn7gsdbvf"; + procMacro = true; + libName = "zerovec_derive"; + authors = [ + "Manish Goregaokar " + ]; + dependencies = [ + { + name = "proc-macro2"; + packageId = "proc-macro2"; + } + { + name = "quote"; + packageId = "quote"; + } + { + name = "syn"; + packageId = "syn 2.0.89"; + features = [ "extra-traits" ]; + } + ]; + + }; }; # diff --git a/Cargo.toml b/Cargo.toml index c79163e5..a66977b4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,5 +30,5 @@ strum = { version = "0.26", features = ["derive"] } tokio = { version = "1.40", features = ["full"] } tracing = "0.1" -[patch."https://github.com/stackabletech/operator-rs.git"] -stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", rev = "de15662cb45ffe7fefb807162dbaa0b377a3bb5f" } +# [patch."https://github.com/stackabletech/operator-rs.git"] +# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" } diff --git a/crate-hashes.json b/crate-hashes.json index 562fb18b..0ca37e6e 100644 --- a/crate-hashes.json +++ b/crate-hashes.json @@ -1,6 +1,6 @@ { - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.80.0#stackable-operator-derive@0.3.1": "16jrq3wdwz63210jgmqbx3snrr15wxw6l1smqhzv7b7jpq8qvya3", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.80.0#stackable-operator@0.80.0": "16jrq3wdwz63210jgmqbx3snrr15wxw6l1smqhzv7b7jpq8qvya3", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.80.0#stackable-shared@0.0.1": "16jrq3wdwz63210jgmqbx3snrr15wxw6l1smqhzv7b7jpq8qvya3", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.82.0#stackable-operator-derive@0.3.1": "0phasjwb64rxgn5hs8vks92icmx9255bd5v9dms280clrfpcg4hy", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.82.0#stackable-operator@0.82.0": "0phasjwb64rxgn5hs8vks92icmx9255bd5v9dms280clrfpcg4hy", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.82.0#stackable-shared@0.0.1": "0phasjwb64rxgn5hs8vks92icmx9255bd5v9dms280clrfpcg4hy", "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/operator-binary/src/druid_controller.rs b/rust/operator-binary/src/druid_controller.rs index a9c5310a..dad2e8f3 100644 --- a/rust/operator-binary/src/druid_controller.rs +++ b/rust/operator-binary/src/druid_controller.rs @@ -35,14 +35,14 @@ use stackable_operator::{ commons::{ opa::OpaApiVersion, product_image_selection::ResolvedProductImage, - rbac::{build_rbac_resources, service_account_name}, + rbac::build_rbac_resources, s3::{S3AccessStyle, S3ConnectionSpec, S3Error}, tls_verification::TlsClientDetailsError, }, k8s_openapi::{ api::{ apps::v1::{StatefulSet, StatefulSetSpec}, - core::v1::{ConfigMap, EnvVar, Service, ServiceSpec}, + core::v1::{ConfigMap, EnvVar, Service, ServiceAccount, ServiceSpec}, }, apimachinery::pkg::apis::meta::v1::LabelSelector, DeepMerge, @@ -50,7 +50,7 @@ use stackable_operator::{ kube::{ core::{error_boundary, DeserializeGuard}, runtime::{controller::Action, reflector::ObjectRef}, - Resource, + Resource, ResourceExt, }, kvp::{KeyValuePairError, Label, LabelError, LabelValueError, Labels}, logging::controller::ReconcilerError, @@ -488,7 +488,8 @@ pub async fn reconcile_druid( ) .context(BuildRbacResourcesSnafu)?; cluster_resources - .add(client, rbac_sa) + // We clone rbac_sa because we need to reuse it below + .add(client, rbac_sa.clone()) .await .context(ApplyServiceAccountSnafu)?; cluster_resources @@ -559,6 +560,7 @@ pub async fn reconcile_druid( s3_conn.as_ref(), &druid_tls_security, &druid_auth_config, + &rbac_sa, )?; cluster_resources .add(client, rg_service) @@ -916,6 +918,7 @@ fn build_rolegroup_statefulset( s3_conn: Option<&S3ConnectionSpec>, druid_tls_security: &DruidTlsSecurity, druid_auth_config: &Option, + service_account: &ServiceAccount, ) -> Result { // prepare container builder let prepare_container_name = Container::Prepare.to_string(); @@ -1119,7 +1122,7 @@ fn build_rolegroup_statefulset( .add_init_container(cb_prepare.build()) .add_container(cb_druid.build()) .metadata(metadata) - .service_account_name(service_account_name(APP_NAME)) + .service_account_name(service_account.name_any()) .security_context( PodSecurityContextBuilder::new() .run_as_user(DRUID_UID) diff --git a/tests/templates/kuttl/overrides/00-assert.yaml.j2 b/tests/templates/kuttl/overrides/00-assert.yaml.j2 index b5613191..ee3402e9 100644 --- a/tests/templates/kuttl/overrides/00-assert.yaml.j2 +++ b/tests/templates/kuttl/overrides/00-assert.yaml.j2 @@ -3,4 +3,4 @@ kind: StatefulSet metadata: name: druid-zk-server-default status: - availableReplicas: 1 \ No newline at end of file + availableReplicas: 1 diff --git a/tests/templates/kuttl/overrides/00-install-zk.yaml.j2 b/tests/templates/kuttl/overrides/00-install-zk.yaml.j2 index 9fa0be75..880c2942 100644 --- a/tests/templates/kuttl/overrides/00-install-zk.yaml.j2 +++ b/tests/templates/kuttl/overrides/00-install-zk.yaml.j2 @@ -25,4 +25,4 @@ metadata: name: hdfs-znode spec: clusterRef: - name: druid-zk \ No newline at end of file + name: druid-zk