WIP

Author: sbernauer

Cargo.lock

@@ -9,7 +9,7 @@ repository.workspace = true
 publish = false
 
 [dependencies]
-stackable-secret-operator-crd-utils = { path = "../crd-utils" }
+stackable-secret-operator-utils = { path = "../utils", features = ["crd"] }
 krb5.workspace = true
 
 byteorder.workspace = true

Cargo.nix

@@ -14,7 +14,7 @@ use stackable_operator::{
     k8s_openapi::api::core::v1::Secret,
     kube::{self, runtime::reflector::ObjectRef},
 };
-use stackable_secret_operator_crd_utils::SecretReference;
+use stackable_secret_operator_utils::crd::SecretReference;
 
 use crate::credential_cache::{self, CredentialCache};
 

rust/crd-utils/Cargo.toml

@@ -8,7 +8,7 @@ use stackable_operator::{
         runtime::reflector::ObjectRef,
     },
 };
-use stackable_secret_operator_crd_utils::SecretReference;
+use stackable_secret_operator_utils::crd::SecretReference;
 
 const OPERATOR_NAME: &str = "secrets.stackable.tech";
 const FIELD_MANAGER_SCOPE: &str = "krb5-provision-keytab";

rust/krb5-provision-keytab/Cargo.toml

@@ -7,7 +7,7 @@ use std::{
 
 use serde::{Deserialize, Serialize};
 use snafu::{ResultExt, Snafu};
-use stackable_secret_operator_crd_utils::SecretReference;
+use stackable_secret_operator_utils::crd::SecretReference;
 use tokio::{io::AsyncWriteExt, process::Command};
 
 #[derive(Serialize, Deserialize)]

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

@@ -10,7 +10,7 @@ publish = false
 
 [dependencies]
 stackable-krb5-provision-keytab = { path = "../krb5-provision-keytab" }
-stackable-secret-operator-crd-utils = { path = "../crd-utils" }
+stackable-secret-operator-utils = { path = "../utils", features = ["crd"] }
 p12 = { path = "../p12" }
 
 anyhow.workspace = true
@@ -40,7 +40,6 @@ tonic-prost.workspace = true
 tonic-reflection.workspace = true
 tracing.workspace = true
 uuid.workspace = true
-yasna.workspace = true
 rand.workspace = true
 const_format.workspace = true
 

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

@@ -10,7 +10,7 @@ use stackable_operator::{
     k8s_openapi::api::core::v1::Secret,
     kube::runtime::reflector::ObjectRef,
 };
-use stackable_secret_operator_crd_utils::SecretReference;
+use stackable_secret_operator_utils::crd::SecretReference;
 use tempfile::tempdir;
 use tokio::{
     fs::File,

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

@@ -32,7 +32,7 @@ use stackable_operator::{
     },
     shared::time::Duration,
 };
-use stackable_secret_operator_crd_utils::{ConfigMapReference, SecretReference};
+use stackable_secret_operator_utils::crd::{ConfigMapReference, SecretReference};
 use time::OffsetDateTime;
 use tracing::{info, info_span, warn};