chore: Bump to operator-rs 0.113.0

Author: sbernauer

Cargo.lock

@@ -11,7 +11,7 @@ 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.108.0", features = ["time", "crds", "webhook"] }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.113.0", features = ["time", "crds", "webhook"] }
 krb5 = { git = "https://github.com/stackabletech/krb5-rs.git", tag = "v0.1.0" }
 
 anyhow = "1.0"
@@ -29,9 +29,7 @@ hex = "0.4"
 # 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"] }
+kube-runtime = { version = "*", default-features = false, features = ["unstable-runtime-stream-control"] }
 ldap3 = { version = "0.12", default-features = false, features = ["gssapi", "tls"] }
 libc = "0.2"
 native-tls = "0.2"

Cargo.toml

@@ -107,7 +107,7 @@ pub enum CertInput {
 }
 
 impl CertInput {
-    pub fn from_file(&self) -> Result<Vec<X509>, CertInputError> {
+    pub fn read_certificates(&self) -> Result<Vec<X509>, CertInputError> {
         let read_file_fn = |path| fs::read(path).context(ReadFileSnafu { path });
 
         match self {

rust/cert-tools/src/cli.rs

@@ -44,7 +44,7 @@ pub fn generate_truststore(args: GeneratePkcs12TruststoreArguments) -> Result<()
     let certificate_sources = certificate_sources
         .iter()
         .map(|source| {
-            let certificates_list = source.from_file().context(ReadCertificateSnafu {
+            let certificates_list = source.read_certificates().context(ReadCertificateSnafu {
                 path: source.path(),
             })?;
 

rust/cert-tools/src/cmds/pkcs12.rs

@@ -93,7 +93,7 @@ pub fn parse_file_workaround(
     password: &str,
 ) -> Result<Vec<X509>, WorkaroundError> {
     let mut child = Command::new("openssl")
-        .args(&[
+        .args([
             "pkcs12",
             "-nokeys",
             "-password",

rust/cert-tools/src/parsers/pkcs12.rs

@@ -22,7 +22,8 @@ use crate::credential_cache::{self, CredentialCache};
 pub enum Error {
     #[snafu(display("failed to retrieve LDAP TLS CA {ca_ref}"))]
     GetLdapTlsCa {
-        source: kube::Error,
+        #[snafu(source(from(kube::Error, Box::new)))]
+        source: Box<kube::Error>,
         ca_ref: ObjectRef<Secret>,
     },
 
@@ -33,7 +34,10 @@ pub enum Error {
     ParseLdapTlsCa { source: native_tls::Error },
 
     #[snafu(display("password cache error"))]
-    PasswordCache { source: credential_cache::Error },
+    PasswordCache {
+        #[snafu(source(from(credential_cache::Error, Box::new)))]
+        source: Box<credential_cache::Error>,
+    },
 
     #[snafu(display("failed to configure LDAP TLS"))]
     ConfigureLdapTls { source: native_tls::Error },
@@ -58,7 +62,8 @@ pub enum Error {
         link = "https://docs.stackable.tech/home/nightly/secret-operator/troubleshooting.html#active-directory-ldap-user-conflict"
     ))]
     CreateLdapUserConflict {
-        source: ldap3::LdapError,
+        #[snafu(source(from(ldap3::LdapError, Box::new)))]
+        source: Box<ldap3::LdapError>,
         password_cache_ref: ObjectRef<Secret>,
     },
 

rust/krb5-provision-keytab/src/active_directory.rs

@@ -69,7 +69,7 @@ enum Error {
 
 enum AdminConnection<'a> {
     Mit(mit::MitAdmin<'a>),
-    ActiveDirectory(active_directory::AdAdmin<'a>),
+    ActiveDirectory(Box<active_directory::AdAdmin<'a>>),
 }
 
 async fn run() -> Result<Response, Error> {
@@ -95,7 +95,7 @@ async fn run() -> Result<Response, Error> {
             user_distinguished_name,
             schema_distinguished_name,
             generate_sam_account_name,
-        } => AdminConnection::ActiveDirectory(
+        } => AdminConnection::ActiveDirectory(Box::new(
             active_directory::AdAdmin::connect(
                 &ldap_server,
                 &krb,
@@ -107,7 +107,7 @@ async fn run() -> Result<Response, Error> {
             )
             .await
             .context(ActiveDirectoryInitSnafu)?,
-        ),
+        )),
     };
     let mut kt = Keytab::resolve(
         &krb,

rust/krb5-provision-keytab/src/main.rs

@@ -1,8 +1,6 @@
 use stackable_operator::kube::{ResourceExt, api::DynamicObject};
 
-pub fn containers<'a>(
-    target: &'a mut DynamicObject,
-) -> anyhow::Result<&'a mut Vec<serde_json::Value>> {
+pub fn containers(target: &mut DynamicObject) -> anyhow::Result<&mut Vec<serde_json::Value>> {
     let tname = target.name_any();
     let path = "template/spec/containers".split("/");
     match get_or_create(target.data.pointer_mut("/spec").unwrap(), path)? {

rust/olm-deployer/src/data.rs

@@ -61,8 +61,7 @@ fn deployer_env_var(deployment: &Deployment) -> Option<&Vec<EnvVar>> {
         .map(|ts| ts.containers.iter())
         .into_iter()
         .flatten()
-        .filter(|c| c.name == "secret-operator-deployer")
-        .last()
+        .rfind(|c| c.name == "secret-operator-deployer")
         .and_then(|c| c.env.as_ref())
 }
 

rust/olm-deployer/src/env/mod.rs

@@ -43,8 +43,7 @@ fn deployment_resources(deployment: &Deployment) -> Option<&ResourceRequirements
         .map(|ts| ts.containers.iter())
         .into_iter()
         .flatten()
-        .filter(|c| c.name == "secret-operator-deployer")
-        .last()
+        .rfind(|c| c.name == "secret-operator-deployer")
         .and_then(|c| c.resources.as_ref())
 }