chore: Bump to stackable-operator 0.106.1

Author: sbernauer

Cargo.lock

@@ -11,20 +11,27 @@ edition = "2021"
 repository = "https://github.com/stackabletech/secret-operator"
 
 [workspace.dependencies]
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.105.0", features = ["time", "telemetry", "versioned", "webhook"] }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.106.1", features = ["time", "telemetry", "versioned", "webhook"] }
 krb5 = { git = "https://github.com/stackabletech/krb5-rs.git", tag = "v0.1.0" }
 
 anyhow = "1.0"
 async-trait = "0.1"
 built = { version = "0.8", features = ["chrono", "git2"] }
 byteorder = "1.5"
+chrono = "0.4"
 clap = "4.5"
 const_format = "0.2.34"
 futures = { version = "0.3", features = ["compat"] }
 h2 = "0.4"
 hex = "0.4"
-# This version needs to match the kube version that is re-exported by stackable-operator!
-kube-runtime = { git = "https://github.com/stackabletech/kube-rs", branch = "2.0.1-fix-schema-hoisting", version = "=2.0.1", features = ["unstable-runtime-stream-control"] }
+# We can't use the stackable-operator re-export because we need the special "unstable-runtime-stream-control"
+# feature. We don't want to enable it in stackable-operator, as we don't want to accidentally use
+# unstable features.
+# This version needs to match the kube version that is re-exported by stackable-operator, so that
+# the feature unification works!
+kube-runtime = { git = "https://github.com/kube-rs/kube-rs", rev = "fe69cc486ff8e62a7da61d64ec3ebbd9e64c43b5", default-features = false, features = ["unstable-runtime-stream-control"] }
+# Hopefully soon we can switch to
+# kube-runtime = { version = "*", default-features = false, features = ["unstable-runtime-stream-control"] }
 ldap3 = { version = "0.11", default-features = false, features = ["gssapi", "tls"] }
 libc = "0.2"
 native-tls = "0.2"

Cargo.nix

@@ -901,6 +901,7 @@ spec:
                 - tls-pem
                 - tls-pkcs12
                 - kerberos
+                - null
                 nullable: true
                 type: string
               secretClassName:

Cargo.toml

@@ -15,9 +15,11 @@ p12 = { path = "../p12" }
 
 anyhow.workspace = true
 async-trait.workspace = true
+chrono.workspace = true
 clap.workspace = true
 futures.workspace = true
 h2.workspace = true
+# We don't directly use this crate, we declare it here to use feature unification
 kube-runtime.workspace = true
 libc.workspace = true
 openssl.workspace = true

crate-hashes.json

@@ -3,15 +3,14 @@
 use std::collections::{BTreeMap, HashSet};
 
 use async_trait::async_trait;
-use kube_runtime::reflector::ObjectRef;
 use snafu::{OptionExt, ResultExt, Snafu};
 use stackable_operator::{
     k8s_openapi::{
         ByteString,
         api::core::v1::{ConfigMap, Secret},
         apimachinery::pkg::apis::meta::v1::LabelSelector,
     },
-    kube::api::ListParams,
+    kube::{api::ListParams, runtime::reflector::ObjectRef},
     kvp::{LabelError, LabelSelectorExt, Labels},
 };
 

extra/crds.yaml

@@ -12,17 +12,16 @@ use std::{collections::HashSet, convert::Infallible, fmt::Debug};
 
 use async_trait::async_trait;
 pub use cert_manager::CertManager;
+use chrono::{DateTime, FixedOffset};
 pub use k8s_search::K8sSearch;
 pub use kerberos_keytab::KerberosKeytab;
-use kube_runtime::reflector::ObjectRef;
 use pod_info::Address;
 use scope::SecretScope;
 use serde::{Deserialize, Deserializer, Serialize, de::Unexpected};
 use snafu::{OptionExt, Snafu};
 use stackable_operator::{
     crd::listener,
-    k8s_openapi::chrono::{DateTime, FixedOffset},
-    kube::api::DynamicObject,
+    kube::{api::DynamicObject, runtime::reflector::ObjectRef},
     shared::time::Duration,
 };
 pub use tls::TlsGenerate;

rust/operator-binary/Cargo.toml

@@ -6,13 +6,12 @@ use std::{
 };
 
 use futures::{StreamExt, TryStreamExt};
-use kube_runtime::reflector::Lookup;
 use snafu::{OptionExt, ResultExt, Snafu};
 use stackable_operator::{
     commons::networking::DomainName,
     crd::listener,
     k8s_openapi::api::core::v1::{Node, PersistentVolumeClaim, Pod},
-    kube::runtime::reflector::ObjectRef,
+    kube::runtime::reflector::{Lookup, ObjectRef},
 };
 
 use super::scope::SecretScope;

rust/operator-binary/src/backend/k8s_search.rs

@@ -2,7 +2,6 @@
 
 use std::{collections::BTreeMap, ffi::OsStr, fmt::Display, path::Path};
 
-use kube_runtime::reflector::Lookup;
 use openssl::{
     asn1::{Asn1Integer, Asn1Time},
     bn::{BigNum, MsbOption},
@@ -28,7 +27,7 @@ use stackable_operator::{
             DynamicObject, PostParams,
             entry::{self, Entry},
         },
-        runtime::reflector::ObjectRef,
+        runtime::reflector::{Lookup, ObjectRef},
     },
     shared::time::Duration,
 };
@@ -673,7 +672,6 @@ impl Manager {
 
 #[cfg(test)]
 mod tests {
-    use kube_runtime::reflector::ObjectRef;
     use openssl::{
         asn1::{Asn1Integer, Asn1Time},
         bn::BigNum,
@@ -684,6 +682,7 @@ mod tests {
     };
     use stackable_operator::{
         k8s_openapi::{ByteString, api::core::v1::Secret},
+        kube::runtime::reflector::ObjectRef,
         shared::time::Duration,
     };
     use stackable_secret_operator_utils::crd::SecretReference;