From ec42892e1c52c6348d67839ac0be1c468a7fc0d4 Mon Sep 17 00:00:00 2001 From: Siegfried Weber Date: Wed, 14 Oct 2026 12:11:38 +0200 Subject: [PATCH] chore: Upgrade stackable-operator to 0.121.0 --- CHANGELOG.md | 6 +- Cargo.lock | 74 ++++---- Cargo.nix | 174 +++++++++--------- Cargo.toml | 4 +- crate-hashes.json | 18 +- rust/operator-binary/Cargo.toml | 2 +- rust/operator-binary/src/controller.rs | 2 +- .../src/controller/build/node_config.rs | 2 +- .../src/controller/build/role_builder.rs | 2 +- .../controller/build/role_group_builder.rs | 7 +- rust/operator-binary/src/crd/mod.rs | 4 +- 11 files changed, 154 insertions(+), 141 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e12525c..ace2151 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ All notable changes to this project will be documented in this file. ### Changed -- Bump stackable-operator to 0.118.0 ([#166], [#171], [#186]). +- Bump stackable-operator to 0.121.0 ([#166], [#171], [#186], [#190], [#198]). - BREAKING: `spec.image.stackableVersion` must now be a full, valid semver version, e.g. `26.7.1`. Abbreviated values such as `26.7` are no longer accepted ([#186]). - BREAKING: `spec.image.pullPolicy` now defaults to `IfNotPresent` for non-floating tags instead of @@ -25,9 +25,10 @@ All notable changes to this project will be documented in this file. - `envOverrides` names are now validated by the shared `EnvVarName` type rather than by operator-specific validation code ([#171]). - All product containers now run with `securityContext.runAsNonRoot` set to `true` to improve security ([#172]). +- All pods now set `securityContext.seccompProfile.type` to `RuntimeDefault` ([#198]). - The operator now early-exits the reconcile action when the cluster is marked for deletion ([#179]). -- Bump stackable-operator to 0.119.0 ([#190]). - test: Bump vector-aggregator to 0.58.0 ([#195]). +- Replace the unmaintained `serde_yaml` crate with `yaml_serde` ([#198]). ### Fixed @@ -43,6 +44,7 @@ All notable changes to this project will be documented in this file. [#189]: https://github.com/stackabletech/opensearch-operator/pull/189 [#190]: https://github.com/stackabletech/opensearch-operator/pull/190 [#195]: https://github.com/stackabletech/opensearch-operator/pull/195 +[#198]: https://github.com/stackabletech/opensearch-operator/pull/198 ## [26.7.0] - 2026-07-21 diff --git a/Cargo.lock b/Cargo.lock index 41e8cf0..3023c71 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1710,8 +1710,8 @@ dependencies = [ [[package]] name = "k8s-version" -version = "0.1.3" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#ed84d456ff0b8324db3d7444659cb207564be8c9" +version = "0.1.4" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.121.0#433ac4fe45418d39631e683fac74cb49e11911f6" dependencies = [ "darling 0.24.0", "regex", @@ -1875,6 +1875,12 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" +[[package]] +name = "libyaml-rs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e126dda6f34391ab7b444f9922055facc83c07a910da3eb16f1e4d9c45dc777" + [[package]] name = "libz-sys" version = "1.1.29" @@ -2986,19 +2992,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_yaml" -version = "0.9.34+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" -dependencies = [ - "indexmap", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - [[package]] name = "sha1" version = "0.10.7" @@ -3169,7 +3162,7 @@ checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "stackable-certs" version = "0.4.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#ed84d456ff0b8324db3d7444659cb207564be8c9" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.121.0#433ac4fe45418d39631e683fac74cb49e11911f6" dependencies = [ "const-oid", "ecdsa", @@ -3203,19 +3196,19 @@ dependencies = [ "semver", "serde", "serde_json", - "serde_yaml", "snafu 0.9.2", "stackable-operator", "strum", "tokio", "tracing", "uuid", + "yaml_serde", ] [[package]] name = "stackable-operator" -version = "0.119.0" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#ed84d456ff0b8324db3d7444659cb207564be8c9" +version = "0.121.0" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.121.0#433ac4fe45418d39631e683fac74cb49e11911f6" dependencies = [ "base64 0.23.1", "clap", @@ -3238,7 +3231,6 @@ dependencies = [ "semver", "serde", "serde_json", - "serde_yaml", "sha2", "snafu 0.9.2", "stackable-operator-derive", @@ -3254,12 +3246,13 @@ dependencies = [ "url", "uuid", "xml", + "yaml_serde", ] [[package]] name = "stackable-operator-derive" version = "0.3.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#ed84d456ff0b8324db3d7444659cb207564be8c9" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.121.0#433ac4fe45418d39631e683fac74cb49e11911f6" dependencies = [ "darling 0.24.0", "proc-macro2", @@ -3269,8 +3262,8 @@ dependencies = [ [[package]] name = "stackable-shared" -version = "0.1.2" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#ed84d456ff0b8324db3d7444659cb207564be8c9" +version = "0.2.0" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.121.0#433ac4fe45418d39631e683fac74cb49e11911f6" dependencies = [ "jiff", "k8s-openapi", @@ -3278,16 +3271,16 @@ dependencies = [ "schemars", "semver", "serde", - "serde_yaml", "snafu 0.9.2", "strum", "time", + "yaml_serde", ] [[package]] name = "stackable-telemetry" version = "0.6.5" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#ed84d456ff0b8324db3d7444659cb207564be8c9" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.121.0#433ac4fe45418d39631e683fac74cb49e11911f6" dependencies = [ "axum", "clap", @@ -3310,22 +3303,22 @@ dependencies = [ [[package]] name = "stackable-versioned" -version = "0.11.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#ed84d456ff0b8324db3d7444659cb207564be8c9" +version = "0.13.0" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.121.0#433ac4fe45418d39631e683fac74cb49e11911f6" dependencies = [ "kube", "schemars", "serde", "serde_json", - "serde_yaml", "snafu 0.9.2", "stackable-versioned-macros", + "yaml_serde", ] [[package]] name = "stackable-versioned-macros" -version = "0.11.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#ed84d456ff0b8324db3d7444659cb207564be8c9" +version = "0.13.0" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.121.0#433ac4fe45418d39631e683fac74cb49e11911f6" dependencies = [ "convert_case", "darling 0.24.0", @@ -3342,7 +3335,7 @@ dependencies = [ [[package]] name = "stackable-webhook" version = "0.10.0" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#ed84d456ff0b8324db3d7444659cb207564be8c9" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.121.0#433ac4fe45418d39631e683fac74cb49e11911f6" dependencies = [ "arc-swap", "async-trait", @@ -3931,12 +3924,6 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" -[[package]] -name = "unsafe-libyaml" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" - [[package]] name = "untrusted" version = "0.9.0" @@ -4305,6 +4292,19 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f45bb2c13fec6a6cb4c0f76a7e94839e110a14ec803ec2940777a94c347bc52" +[[package]] +name = "yaml_serde" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33b729a08a9a6be689bbad3e2bf8015926db54b6622cc89c3a5f7dc174b9e918" +dependencies = [ + "indexmap", + "itoa", + "libyaml-rs", + "ryu", + "serde", +] + [[package]] name = "yansi" version = "1.0.1" diff --git a/Cargo.nix b/Cargo.nix index 4ce1fa0..521ff2c 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -5410,13 +5410,13 @@ rec { }; "k8s-version" = rec { crateName = "k8s-version"; - version = "0.1.3"; + version = "0.1.4"; edition = "2024"; workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "ed84d456ff0b8324db3d7444659cb207564be8c9"; - sha256 = "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0"; + rev = "433ac4fe45418d39631e683fac74cb49e11911f6"; + sha256 = "1dax2l1ghd609k19z4kznpnk5v40xbl84qwwxlfvwjamvf7jj6mm"; }; libName = "k8s_version"; authors = [ @@ -6147,6 +6147,19 @@ rec { }; resolvedDefaultFeatures = [ "arch" "default" ]; }; + "libyaml-rs" = rec { + crateName = "libyaml-rs"; + version = "0.3.0"; + edition = "2021"; + crateBin = []; + sha256 = "0xy7bp2dkr7i2vms63cigb087k7salh95ya4njvilf9ldzd6s4if"; + libName = "libyaml_rs"; + authors = [ + "David Tolnay " + "YAML Organization " + ]; + + }; "libz-sys" = rec { crateName = "libz-sys"; version = "1.1.29"; @@ -9846,38 +9859,6 @@ rec { } ]; - }; - "serde_yaml" = rec { - crateName = "serde_yaml"; - version = "0.9.34+deprecated"; - edition = "2021"; - sha256 = "0isba1fjyg3l6rxk156k600ilzr8fp7crv82rhal0rxz5qd1m2va"; - authors = [ - "David Tolnay " - ]; - dependencies = [ - { - name = "indexmap"; - packageId = "indexmap"; - } - { - name = "itoa"; - packageId = "itoa"; - } - { - name = "ryu"; - packageId = "ryu"; - } - { - name = "serde"; - packageId = "serde"; - } - { - name = "unsafe-libyaml"; - packageId = "unsafe-libyaml"; - } - ]; - }; "sha1" = rec { crateName = "sha1"; @@ -10370,8 +10351,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "ed84d456ff0b8324db3d7444659cb207564be8c9"; - sha256 = "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0"; + rev = "433ac4fe45418d39631e683fac74cb49e11911f6"; + sha256 = "1dax2l1ghd609k19z4kznpnk5v40xbl84qwwxlfvwjamvf7jj6mm"; }; libName = "stackable_certs"; authors = [ @@ -10508,10 +10489,6 @@ rec { name = "serde_json"; packageId = "serde_json"; } - { - name = "serde_yaml"; - packageId = "serde_yaml"; - } { name = "snafu"; packageId = "snafu 0.9.2"; @@ -10536,6 +10513,10 @@ rec { name = "tracing"; packageId = "tracing"; } + { + name = "yaml_serde"; + packageId = "yaml_serde"; + } ]; buildDependencies = [ { @@ -10569,13 +10550,13 @@ rec { }; "stackable-operator" = rec { crateName = "stackable-operator"; - version = "0.119.0"; + version = "0.121.0"; edition = "2024"; workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "ed84d456ff0b8324db3d7444659cb207564be8c9"; - sha256 = "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0"; + rev = "433ac4fe45418d39631e683fac74cb49e11911f6"; + sha256 = "1dax2l1ghd609k19z4kznpnk5v40xbl84qwwxlfvwjamvf7jj6mm"; }; libName = "stackable_operator"; authors = [ @@ -10677,10 +10658,6 @@ rec { name = "serde_json"; packageId = "serde_json"; } - { - name = "serde_yaml"; - packageId = "serde_yaml"; - } { name = "sha2"; packageId = "sha2"; @@ -10750,6 +10727,10 @@ rec { name = "xml"; packageId = "xml"; } + { + name = "yaml_serde"; + packageId = "yaml_serde"; + } ]; features = { "certs" = [ "dep:stackable-certs" ]; @@ -10773,8 +10754,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "ed84d456ff0b8324db3d7444659cb207564be8c9"; - sha256 = "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0"; + rev = "433ac4fe45418d39631e683fac74cb49e11911f6"; + sha256 = "1dax2l1ghd609k19z4kznpnk5v40xbl84qwwxlfvwjamvf7jj6mm"; }; procMacro = true; libName = "stackable_operator_derive"; @@ -10803,13 +10784,13 @@ rec { }; "stackable-shared" = rec { crateName = "stackable-shared"; - version = "0.1.2"; + version = "0.2.0"; edition = "2024"; workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "ed84d456ff0b8324db3d7444659cb207564be8c9"; - sha256 = "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0"; + rev = "433ac4fe45418d39631e683fac74cb49e11911f6"; + sha256 = "1dax2l1ghd609k19z4kznpnk5v40xbl84qwwxlfvwjamvf7jj6mm"; }; libName = "stackable_shared"; authors = [ @@ -10847,10 +10828,6 @@ rec { packageId = "serde"; features = [ "derive" ]; } - { - name = "serde_yaml"; - packageId = "serde_yaml"; - } { name = "snafu"; packageId = "snafu 0.9.2"; @@ -10865,6 +10842,10 @@ rec { packageId = "time"; optional = true; } + { + name = "yaml_serde"; + packageId = "yaml_serde"; + } ]; devDependencies = [ { @@ -10889,8 +10870,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "ed84d456ff0b8324db3d7444659cb207564be8c9"; - sha256 = "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0"; + rev = "433ac4fe45418d39631e683fac74cb49e11911f6"; + sha256 = "1dax2l1ghd609k19z4kznpnk5v40xbl84qwwxlfvwjamvf7jj6mm"; }; libName = "stackable_telemetry"; authors = [ @@ -10994,13 +10975,13 @@ rec { }; "stackable-versioned" = rec { crateName = "stackable-versioned"; - version = "0.11.1"; + version = "0.13.0"; edition = "2024"; workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "ed84d456ff0b8324db3d7444659cb207564be8c9"; - sha256 = "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0"; + rev = "433ac4fe45418d39631e683fac74cb49e11911f6"; + sha256 = "1dax2l1ghd609k19z4kznpnk5v40xbl84qwwxlfvwjamvf7jj6mm"; }; libName = "stackable_versioned"; authors = [ @@ -11027,10 +11008,6 @@ rec { name = "serde_json"; packageId = "serde_json"; } - { - name = "serde_yaml"; - packageId = "serde_yaml"; - } { name = "snafu"; packageId = "snafu 0.9.2"; @@ -11039,18 +11016,22 @@ rec { name = "stackable-versioned-macros"; packageId = "stackable-versioned-macros"; } + { + name = "yaml_serde"; + packageId = "yaml_serde"; + } ]; }; "stackable-versioned-macros" = rec { crateName = "stackable-versioned-macros"; - version = "0.11.1"; + version = "0.13.0"; edition = "2024"; workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "ed84d456ff0b8324db3d7444659cb207564be8c9"; - sha256 = "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0"; + rev = "433ac4fe45418d39631e683fac74cb49e11911f6"; + sha256 = "1dax2l1ghd609k19z4kznpnk5v40xbl84qwwxlfvwjamvf7jj6mm"; }; procMacro = true; libName = "stackable_versioned_macros"; @@ -11113,8 +11094,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "ed84d456ff0b8324db3d7444659cb207564be8c9"; - sha256 = "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0"; + rev = "433ac4fe45418d39631e683fac74cb49e11911f6"; + sha256 = "1dax2l1ghd609k19z4kznpnk5v40xbl84qwwxlfvwjamvf7jj6mm"; }; libName = "stackable_webhook"; authors = [ @@ -13208,18 +13189,6 @@ rec { }; resolvedDefaultFeatures = [ "default" ]; }; - "unsafe-libyaml" = rec { - crateName = "unsafe-libyaml"; - version = "0.2.11"; - edition = "2021"; - crateBin = []; - sha256 = "0qdq69ffl3v5pzx9kzxbghzn0fzn266i1xn70y88maybz9csqfk7"; - libName = "unsafe_libyaml"; - authors = [ - "David Tolnay " - ]; - - }; "untrusted" = rec { crateName = "untrusted"; version = "0.9.0"; @@ -15093,6 +15062,45 @@ rec { ]; }; + "yaml_serde" = rec { + crateName = "yaml_serde"; + version = "0.10.7"; + edition = "2021"; + sha256 = "0679p5sc2zaz7afchb32nradn9jr07w2ngmdpf4ycswsiah2kdrk"; + authors = [ + "YAML Organization " + ]; + dependencies = [ + { + name = "indexmap"; + packageId = "indexmap"; + usesDefaultFeatures = false; + } + { + name = "itoa"; + packageId = "itoa"; + } + { + name = "libyaml-rs"; + packageId = "libyaml-rs"; + } + { + name = "ryu"; + packageId = "ryu"; + } + { + name = "serde"; + packageId = "serde"; + usesDefaultFeatures = false; + features = [ "alloc" ]; + } + ]; + features = { + "default" = [ "std" ]; + "std" = [ "serde/std" "indexmap/std" ]; + }; + resolvedDefaultFeatures = [ "default" "std" ]; + }; "yansi" = rec { crateName = "yansi"; version = "1.0.1"; diff --git a/Cargo.toml b/Cargo.toml index cf6f3f8..f036526 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ edition = "2024" repository = "https://github.com/stackabletech/opensearch-operator" [workspace.dependencies] -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.119.0", features = ["webhook"] } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.121.0", features = ["webhook"] } built = { version = "0.8", features = ["chrono", "git2"] } clap = "4.6" @@ -21,12 +21,12 @@ rstest = "0.26" semver = "1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -serde_yaml = "0.9" snafu = { version = "0.9", features = ["futures"] } strum = { version = "0.28", features = ["derive"] } tokio = { version = "1.53", features = ["full"] } tracing = "0.1" uuid = "1.24" +yaml_serde = "0.10" [patch."https://github.com/stackabletech/operator-rs"] # stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" } diff --git a/crate-hashes.json b/crate-hashes.json index 2046087..3649921 100644 --- a/crate-hashes.json +++ b/crate-hashes.json @@ -1,11 +1,11 @@ { - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#k8s-version@0.1.3": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#stackable-certs@0.4.1": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#stackable-operator-derive@0.3.1": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#stackable-operator@0.119.0": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#stackable-shared@0.1.2": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#stackable-telemetry@0.6.5": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#stackable-versioned-macros@0.11.1": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#stackable-versioned@0.11.1": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.119.0#stackable-webhook@0.10.0": "1ra6n0mi633sipsgrli7hhxv64khhs00l448mqg61gxsjc4y02r0" + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.121.0#k8s-version@0.1.4": "1dax2l1ghd609k19z4kznpnk5v40xbl84qwwxlfvwjamvf7jj6mm", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.121.0#stackable-certs@0.4.1": "1dax2l1ghd609k19z4kznpnk5v40xbl84qwwxlfvwjamvf7jj6mm", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.121.0#stackable-operator-derive@0.3.1": "1dax2l1ghd609k19z4kznpnk5v40xbl84qwwxlfvwjamvf7jj6mm", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.121.0#stackable-operator@0.121.0": "1dax2l1ghd609k19z4kznpnk5v40xbl84qwwxlfvwjamvf7jj6mm", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.121.0#stackable-shared@0.2.0": "1dax2l1ghd609k19z4kznpnk5v40xbl84qwwxlfvwjamvf7jj6mm", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.121.0#stackable-telemetry@0.6.5": "1dax2l1ghd609k19z4kznpnk5v40xbl84qwwxlfvwjamvf7jj6mm", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.121.0#stackable-versioned-macros@0.13.0": "1dax2l1ghd609k19z4kznpnk5v40xbl84qwwxlfvwjamvf7jj6mm", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.121.0#stackable-versioned@0.13.0": "1dax2l1ghd609k19z4kznpnk5v40xbl84qwwxlfvwjamvf7jj6mm", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.121.0#stackable-webhook@0.10.0": "1dax2l1ghd609k19z4kznpnk5v40xbl84qwwxlfvwjamvf7jj6mm" } \ No newline at end of file diff --git a/rust/operator-binary/Cargo.toml b/rust/operator-binary/Cargo.toml index da432fb..d0114a6 100644 --- a/rust/operator-binary/Cargo.toml +++ b/rust/operator-binary/Cargo.toml @@ -24,11 +24,11 @@ regex.workspace = true semver.workspace = true serde.workspace = true serde_json.workspace = true -serde_yaml.workspace = true snafu.workspace = true strum.workspace = true tokio.workspace = true tracing.workspace = true +yaml_serde.workspace = true [build-dependencies] built.workspace = true diff --git a/rust/operator-binary/src/controller.rs b/rust/operator-binary/src/controller.rs index 8f96660..7abf33f 100644 --- a/rust/operator-binary/src/controller.rs +++ b/rust/operator-binary/src/controller.rs @@ -700,7 +700,7 @@ mod tests { /// API, and because the spec is invalid, before the `DeserializeGuard` is unwrapped. #[test] fn reconcile_exits_early_for_deleted_cluster() { - let cluster = serde_yaml::from_str( + let cluster = yaml_serde::from_str( r#" apiVersion: opensearch.stackable.tech/v1alpha1 kind: OpenSearchCluster diff --git a/rust/operator-binary/src/controller/build/node_config.rs b/rust/operator-binary/src/controller/build/node_config.rs index 83bf430..88f0516 100644 --- a/rust/operator-binary/src/controller/build/node_config.rs +++ b/rust/operator-binary/src/controller/build/node_config.rs @@ -190,7 +190,7 @@ impl NodeConfig { /// Creates the main OpenSearch configuration file in YAML format pub fn opensearch_config_file_content(&self) -> String { - serde_yaml::to_string(&self.opensearch_config()) + yaml_serde::to_string(&self.opensearch_config()) .expect("serde_json::Value should always be serializable as a string of YAML") } diff --git a/rust/operator-binary/src/controller/build/role_builder.rs b/rust/operator-binary/src/controller/build/role_builder.rs index cd7c306..5388861 100644 --- a/rust/operator-binary/src/controller/build/role_builder.rs +++ b/rust/operator-binary/src/controller/build/role_builder.rs @@ -223,7 +223,7 @@ impl<'a> RoleBuilder<'a> { { data.insert( file_type.filename.to_owned(), - serde_yaml::to_string(value).expect( + yaml_serde::to_string(value).expect( "serde_json::Value should always be serializable as a string of YAML", ), ); diff --git a/rust/operator-binary/src/controller/build/role_group_builder.rs b/rust/operator-binary/src/controller/build/role_group_builder.rs index 1de198a..ccf03bd 100644 --- a/rust/operator-binary/src/controller/build/role_group_builder.rs +++ b/rust/operator-binary/src/controller/build/role_group_builder.rs @@ -2169,7 +2169,7 @@ mod tests { concat!( "mkdir --parents /stackable/log/_vector-state\n", "# Vector will ignore SIGTERM (as PID != 1) and must be shut down by writing a shutdown trigger file\n", - "vector & vector_pid=$!\n", + "/stackable/bin/vector-with-env-var-interpolation & vector_pid=$!\n", "if [ ! -f \"/stackable/log/_vector/shutdown\" ]; then\n", "mkdir -p /stackable/log/_vector\n", "inotifywait -qq --event create /stackable/log/_vector;\n", @@ -3165,7 +3165,10 @@ mod tests { "initContainers": expected_init_containers, "securityContext": { "fsGroup": 1000, - "runAsNonRoot": true + "runAsNonRoot": true, + "seccompProfile": { + "type": "RuntimeDefault" + } }, "serviceAccountName": "my-opensearch-cluster-serviceaccount", "terminationGracePeriodSeconds": 30, diff --git a/rust/operator-binary/src/crd/mod.rs b/rust/operator-binary/src/crd/mod.rs index aa44193..6f26853 100644 --- a/rust/operator-binary/src/crd/mod.rs +++ b/rust/operator-binary/src/crd/mod.rs @@ -922,8 +922,8 @@ mod tests { impl RoundtripTestData for v1alpha1::OpenSearchClusterSpec { fn roundtrip_test_data() -> Vec { - serde_yaml::Deserializer::from_str(include_str!("roundtrip_test_data.yaml")) - .map(serde_yaml::with::singleton_map_recursive::deserialize) + yaml_serde::Deserializer::from_str(include_str!("roundtrip_test_data.yaml")) + .map(yaml_serde::with::singleton_map_recursive::deserialize) .collect::>() .expect("roundtrip_test_data.yaml should contain OpenSearchClusterSpec documents") }