Merge branch 'main' into feat/gitsync-ssh

Author: adwk67

Cargo.lock

@@ -23,19 +23,20 @@ darling = "0.23.0"
 delegate = "0.13.0"
 dockerfile-parser = "0.9.0"
 ecdsa = { version = "0.16.9", features = ["digest", "pem"] }
-educe =  { version = "0.6.0", default-features = false, features = ["Clone", "Debug", "Default", "PartialEq", "Eq"] }
+educe = { version = "0.6.0", default-features = false, features = ["Clone", "Debug", "Default", "PartialEq", "Eq"] }
 either = "1.13.0"
 futures = "0.3.30"
 futures-util = "0.3.30"
 http = "1.3.1"
 indexmap = "2.5.0"
 indoc = "2.0.6"
-insta = { version= "1.40", features = ["glob"] }
+insta = { version = "1.40", features = ["glob"] }
 hyper = { version = "1.4.1", features = ["full"] }
 hyper-util = "0.1.8"
 itertools = "0.14.0"
 json-patch = "4.0.0"
-k8s-openapi = { version = "0.26.0", default-features = false, features = ["schemars", "v1_34"] }
+# k8s-openapi 0.26.1 doesn't play well with our kube version: https://github.com/kube-rs/kube/issues/1869
+k8s-openapi = { version = "=0.26.0", default-features = false, features = ["schemars", "v1_34"] }
 # We use rustls instead of openssl for easier portability, e.g. so that we can build stackablectl without the need to vendor (build from source) openssl
 # We use ring instead of aws-lc-rs, as this currently fails to build in "make run-dev"
 # We pin the kube version, as we use a patch for 2.0.1

Cargo.toml

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+### Changed
+
+- Revert and pin k8s-openapi to 0.26.0 ([#1135]).
+
+[#1135]: https://github.com/stackabletech/operator-rs/pull/1135
+
 ## [0.101.2] - 2026-01-07
 
 ### Changed

crates/stackable-operator/CHANGELOG.md

@@ -135,7 +135,7 @@ impl<H> ConversionWebhook<H> {
     }
 
     #[instrument(
-        skip(self, crd, crd_api),
+        skip(self, crd, crd_api, new_ca_bundle),
         fields(
             name = crd.name_any(),
             kind = &crd.spec.names.kind
@@ -244,7 +244,7 @@ where
         self.options.disable_crd_maintenance
     }
 
-    #[instrument(skip(self))]
+    #[instrument(skip(self, new_ca_bundle))]
     async fn handle_certificate_rotation(
         &mut self,
         new_ca_bundle: &ByteString,

crates/stackable-operator/crds/DummyCluster.yaml

@@ -206,7 +206,7 @@ where
         self.options.disable_mwc_maintenance
     }
 
-    #[instrument(skip(self))]
+    #[instrument(skip(self, new_ca_bundle))]
     async fn handle_certificate_rotation(
         &mut self,
         new_ca_bundle: &ByteString,