chore: Bump dependencies (#431)

* chore: bump external dependencies

* chore: bump stackable-operator

* chore: regenerate-nix

* chore: use major.minor minimum versions

* chore: use merged h2 patch branch

* chore(nix): make regenerate-nix

Author: NickLarsenNZ

Cargo.lock

@@ -13,45 +13,40 @@ repository = "https://github.com/stackabletech/secret-operator"
 [workspace.dependencies]
 anyhow = "1.0"
 async-trait = "0.1"
-bindgen = "0.66"
-built = { version = "0.6", features = ["chrono", "git2"] }
-byteorder = "1.4"
-clap = "4.3"
+bindgen = "0.69"
+built = { version = "0.7", features = ["chrono", "git2"] }
+byteorder = "1.5"
+clap = "4.5"
 futures = { version = "0.3", features = ["compat"] }
-h2 = "=0.3.18" # We need to keep this in sync with our patched h2 build
-ldap3 = { version = "0.11", default-features = false, features = [
-  "gssapi",
-  "tls",
-] }
+h2 = "=0.3.26" # We need to keep this in sync with our patched h2 build
+ldap3 = { version = "0.11", default-features = false, features = ["gssapi", "tls"] }
 libc = "0.2"
 native-tls = "0.2"
 openssl = "0.10"
 p12 = "0.6"
 pin-project = "1.1"
 pkg-config = "0.3"
-prost = "0.11"
-prost-types = "0.11"
+prost = "0.12"
+prost-types = "0.12"
 rand = "0.8"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_yaml = "0.9"
-snafu = "0.7"
+snafu = "0.8"
 socket2 = { version = "0.5", features = ["all"] }
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.64.0", features = [
-  "time",
-] }
-strum = { version = "0.25", features = ["derive"] }
-sys-mount = { version = "2.1", default-features = false }
-tempfile = "3.3"
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.67.1", features = ["time"] }
+strum = { version = "0.26", features = ["derive"] }
+sys-mount = { version = "3.0", default-features = false }
+tempfile = "3.10"
 time = { version = "0.3", features = ["parsing"] }
-tokio = { version = "1.29", features = ["full"] }
+tokio = { version = "1.37", features = ["full"] }
 tokio-stream = { version = "0.1", features = ["net"] }
-tonic = "0.9"
-tonic-build = "0.9"
-tonic-reflection = "0.9"
+tonic = "0.11.0"
+tonic-build = "0.11.0"
+tonic-reflection = "0.11.0"
 tracing = "0.1"
 tracing-subscriber = "0.3"
-uuid = { version = "1.2", features = ["v4"] }
+uuid = { version = "1.8.0", features = ["v4"] }
 yasna = "0.5"
 
 [patch.crates-io]

Cargo.nix

@@ -14,7 +14,7 @@ use crate::credential_cache::{self, CredentialCache};
 pub enum Error {
     #[snafu(display("failed to retrieve LDAP TLS CA {ca_ref}"))]
     GetLdapTlsCa {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
         ca_ref: ObjectRef<Secret>,
     },
 
@@ -38,21 +38,21 @@ pub enum Error {
 
     #[snafu(display("failed to init Kubernetes client"))]
     KubeInit {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
     },
 
     #[snafu(display("failed to unparse Kerberos principal"))]
     UnparsePrincipal { source: krb5::Error },
 
     #[snafu(display("failed to get password cache {password_cache_ref}"))]
     GetPasswordCache {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
         password_cache_ref: ObjectRef<Secret>,
     },
 
     #[snafu(display("failed to update password cache {password_cache_ref}"))]
     UpdatePasswordCache {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
         password_cache_ref: ObjectRef<Secret>,
     },
 

Cargo.toml

@@ -10,13 +10,13 @@ use stackable_secret_operator_crd_utils::SecretReference;
 pub enum Error {
     #[snafu(display("failed to load initial cache from {cache_ref}"))]
     GetInitialCache {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
         cache_ref: ObjectRef<Secret>,
     },
 
     #[snafu(display("failed to save credential {key} to {cache_ref}"))]
     SaveToCache {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
         key: String,
         cache_ref: ObjectRef<Secret>,
     },

crate-hashes.json

@@ -25,7 +25,7 @@ fn main() {
         .must_use_type("krb5_error_code")
         .must_use_type("kadm5_ret_t")
         // .default_macro_constant_type(bindgen::MacroTypeVariation::Signed)
-        .parse_callbacks(Box::new(bindgen::CargoCallbacks))
+        .parse_callbacks(Box::new(bindgen::CargoCallbacks::new()))
         .generate()
         .expect("Unable to generate bindings");
     let out_path = PathBuf::from(env::var_os("OUT_DIR").expect("OUT_DIR not set"));

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

@@ -8,12 +8,5 @@ fn main() {
         .file_descriptor_set_path(out_dir.join("file_descriptor_set.bin"))
         .compile(&["csi.proto"], &["vendor/csi"])
         .unwrap();
-    built::write_built_file_with_opts(
-        // built's env module depends on a whole bunch of variables that crate2nix doesn't provide
-        // so we grab the specific env variables that we care about out ourselves instead.
-        built::Options::default().set_env(false),
-        "Cargo.toml".as_ref(),
-        &out_dir.join("built.rs"),
-    )
-    .unwrap();
+    built::write_built_file().unwrap();
 }

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

@@ -138,7 +138,7 @@ pub async fn from_class(
 pub enum FromSelectorError {
     #[snafu(display("failed to get {class}"))]
     GetSecretClass {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
         class: ObjectRef<SecretClass>,
     },
 

rust/krb5-sys/build.rs

@@ -30,12 +30,12 @@ const LABEL_SCOPE_LISTENER: &str = "secrets.stackable.tech/listener";
 pub enum Error {
     #[snafu(display("failed to build Secret selector"))]
     SecretSelector {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::kvp::SelectorError,
     },
 
     #[snafu(display("failed to query for secrets"))]
     SecretQuery {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
     },
 
     #[snafu(display("no Secrets matched label selector {label_selector:?}"))]

rust/operator-binary/build.rs

@@ -29,7 +29,7 @@ pub enum Error {
 
     #[snafu(display("failed to load admin keytab from {secret}"))]
     LoadAdminKeytab {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
         secret: ObjectRef<Secret>,
     },
 

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

@@ -44,7 +44,7 @@ pub enum FromPodError {
 
     #[snafu(display("failed to get {node}"))]
     GetNode {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
         node: ObjectRef<Node>,
     },
 
@@ -53,21 +53,21 @@ pub enum FromPodError {
 
     #[snafu(display("failed to get listener PVC {listener_pvc} for volume {listener_volume}"))]
     GetListenerPvc {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
         listener_volume: String,
         listener_pvc: ObjectRef<PersistentVolumeClaim>,
     },
 
     #[snafu(display("failed to get {listener} for volume {listener_volume}"))]
     GetListener {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
         listener_volume: String,
         listener: ObjectRef<Listener>,
     },
 
     #[snafu(display("failed to get {listener_class} for volume {listener_volume}"))]
     GetListenerClass {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
         listener_volume: String,
         listener_class: ObjectRef<ListenerClass>,
     },
@@ -88,7 +88,7 @@ pub enum FromPodError {
 
     #[snafu(display("failed to get {pod_listeners} for {pod}"))]
     GetPodListeners {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
         pod_listeners: ObjectRef<PodListeners>,
         pod: ObjectRef<Pod>,
     },

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

@@ -36,7 +36,7 @@ enum CreateVolumeError {
 
     #[snafu(display("failed to load {pvc}"))]
     FindPvc {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
         pvc: ObjectRef<PersistentVolumeClaim>,
     },
 
@@ -47,7 +47,7 @@ enum CreateVolumeError {
 
     #[snafu(display("failed to get pod for volume"))]
     GetPod {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
     },
 
     #[snafu(display("failed to parse pod details"))]

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

@@ -8,7 +8,7 @@ use openssl::sha::Sha256;
 use serde::{de::IntoDeserializer, Deserialize};
 use snafu::{ResultExt, Snafu};
 use stackable_operator::{
-    builder::ObjectMetaBuilder,
+    builder::meta::ObjectMetaBuilder,
     k8s_openapi::api::core::v1::Pod,
     kvp::{AnnotationError, Annotations},
 };
@@ -45,7 +45,7 @@ enum PublishError {
 
     #[snafu(display("failed to get pod for volume"))]
     GetPod {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
     },
 
     #[snafu(display("failed to parse pod details"))]
@@ -94,7 +94,7 @@ enum PublishError {
 
     #[snafu(display("failed to tag pod with expiry metadata"))]
     TagPod {
-        source: stackable_operator::error::Error,
+        source: stackable_operator::client::Error,
     },
 
     #[snafu(display("failed to build annotation"))]

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

@@ -52,16 +52,14 @@ struct SecretOperatorRun {
 
 mod built_info {
     include!(concat!(env!("OUT_DIR"), "/built.rs"));
-    pub const TARGET: Option<&str> = option_env!("TARGET");
-    pub const CARGO_PKG_VERSION: &str = env!("CARGO_PKG_VERSION");
 }
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
     let opts = Opts::parse();
     match opts.cmd {
         stackable_operator::cli::Command::Crd => {
-            crd::SecretClass::print_yaml_schema(built_info::CARGO_PKG_VERSION)?;
+            crd::SecretClass::print_yaml_schema(built_info::PKG_VERSION)?;
         }
         stackable_operator::cli::Command::Run(SecretOperatorRun {
             csi_endpoint,
@@ -78,7 +76,7 @@ async fn main() -> anyhow::Result<()> {
                 crate_description!(),
                 crate_version!(),
                 built_info::GIT_VERSION,
-                built_info::TARGET.unwrap_or("unknown target"),
+                built_info::TARGET,
                 built_info::BUILT_TIME_UTC,
                 built_info::RUSTC_VERSION,
             );