bump k8s-controller

Cargo.toml

@@ -381,7 +381,7 @@ itertools = "0.14.0"
 jemalloc_pprof = "0.8.2"
 jsonwebtoken = { version = "10.3.0", features = ["aws_lc_rs"] }
 junit-report = "0.8.3"
-k8s-controller = "0.10.0"
+k8s-controller = "0.11.0"
 k8s-openapi = { version = "0.27.0", features = ["schemars", "v1_32"] }
 kube = { version = "3.1.0", default-features = false, features = ["client", "derive", "openssl-tls", "runtime", "ws"] }
 launchdarkly-server-sdk = { version = "2.6.2", default-features = false }

src/orchestratord/src/controller/balancer.rs

@@ -8,6 +8,7 @@
 // by the Apache License, Version 2.0.
 
 use anyhow::bail;
+use k8s_controller::TraceMetadata;
 use k8s_openapi::{
     api::{
         apps::v1::{Deployment, DeploymentSpec, DeploymentStrategy, RollingUpdateDeployment},
@@ -554,6 +555,7 @@ impl k8s_controller::Context for Context {
         &self,
         client: Client,
         balancer: &Self::Resource,
+        _metadata: &mut TraceMetadata,
     ) -> Result<Option<Action>, Self::Error> {
         if balancer.status.is_none() {
             let balancer_api: Api<Balancer> =

src/orchestratord/src/controller/console.rs

@@ -7,6 +7,7 @@
 // the Business Source License, use of this software will be governed
 // by the Apache License, Version 2.0.
 
+use k8s_controller::TraceMetadata;
 use k8s_openapi::{
     api::{
         apps::v1::{Deployment, DeploymentSpec},
@@ -582,6 +583,7 @@ impl k8s_controller::Context for Context {
         &self,
         client: Client,
         console: &Self::Resource,
+        _metadata: &mut TraceMetadata,
     ) -> Result<Option<Action>, Self::Error> {
         if console.status.is_none() {
             let console_api: Api<Console> =

src/orchestratord/src/controller/materialize.rs

@@ -15,6 +15,7 @@ use std::{
 
 use anyhow::Context as _;
 use http::HeaderValue;
+use k8s_controller::TraceMetadata;
 use k8s_openapi::{
     api::core::v1::{Affinity, ResourceRequirements, Secret, Toleration},
     apimachinery::pkg::apis::meta::v1::{Condition, Time},
@@ -273,6 +274,7 @@ impl k8s_controller::Context for Context {
         &self,
         client: Client,
         mz: &Self::Resource,
+        _metadata: &mut TraceMetadata,
     ) -> Result<Option<Action>, Self::Error> {
         let mz_api: Api<Materialize> = Api::namespaced(client.clone(), &mz.namespace());
         let balancer_api: Api<Balancer> = Api::namespaced(client.clone(), &mz.namespace());
@@ -888,6 +890,7 @@ impl k8s_controller::Context for Context {
         &self,
         _client: Client,
         mz: &Self::Resource,
+        _metadata: &mut TraceMetadata,
     ) -> Result<Option<Action>, Self::Error> {
         self.set_needs_update(mz, false);
 

test/orchestratord/mzcompose.py

@@ -101,7 +101,7 @@ def get_version(tag: str | None = None) -> MzVersion:
 
 
 def get_image(image: str, tag: str | None) -> str:
-    return f'{image.rsplit(":", 1)[0]}:{get_tag(tag)}'
+    return f"{image.rsplit(':', 1)[0]}:{get_tag(tag)}"
 
 
 def get_upgrade_target(
@@ -276,7 +276,7 @@ def render_kind_cluster_config() -> None:
         out_file.write(
             text.replace(
                 "$DOCKER_CONFIG",
-                os.getenv("DOCKER_CONFIG", f'{os.environ["HOME"]}/.docker'),
+                os.getenv("DOCKER_CONFIG", f"{os.environ['HOME']}/.docker"),
             )
         )
 
@@ -3432,7 +3432,7 @@ def post_run_check(definition: dict[str, Any], expect_fail: bool) -> None:
                         stderr=subprocess.DEVNULL,
                     )
                     if (
-                        f"ERROR k8s_controller::controller: Materialize reconciliation error. err=reconciler for object Materialize.v1alpha1.materialize.cloud/{definition['materialize']['metadata']['name']}.materialize-environment failed"
+                        f"ERROR reconciling object{{object.ref=Materialize.v1alpha1.materialize.cloud/{definition['materialize']['metadata']['name']}.materialize-environment"
                         in logs
                     ):
                         break