fix: add namespace / uid to ValidatedCluster

Author: maltesander

rust/operator-binary/src/controller/build/properties/env_vars.rs

@@ -214,7 +214,7 @@ pub fn build_airflow_statefulset_envs(
             AIRFLOW_KUBERNETES_EXECUTOR_NAMESPACE.into(),
             EnvVar {
                 name: AIRFLOW_KUBERNETES_EXECUTOR_NAMESPACE.into(),
-                value: cluster.namespace(),
+                value: Some(cluster.namespace.to_string()),
                 ..Default::default()
             },
         );
@@ -393,7 +393,7 @@ pub fn build_airflow_template_envs(
         AIRFLOW_KUBERNETES_EXECUTOR_NAMESPACE.into(),
         EnvVar {
             name: AIRFLOW_KUBERNETES_EXECUTOR_NAMESPACE.into(),
-            value: cluster.namespace(),
+            value: Some(cluster.namespace.to_string()),
             ..Default::default()
         },
     );

rust/operator-binary/src/controller/mod.rs

@@ -17,7 +17,9 @@ use stackable_operator::{
         product_logging::framework::{ValidatedContainerLogConfigChoice, VectorContainerLogConfig},
         role_group_utils::ResourceNames,
         types::{
-            kubernetes::{ConfigMapName, ListenerClassName, ListenerName, SecretName, Uid},
+            kubernetes::{
+                ConfigMapName, ListenerClassName, ListenerName, NamespaceName, SecretName, Uid,
+            },
             operator::{
                 ClusterName, ControllerName, OperatorName, ProductName, ProductVersion,
                 RoleGroupName, RoleName,
@@ -120,6 +122,11 @@ pub struct ValidatedCluster {
     metadata: ObjectMeta,
     /// The cluster name as a type-safe value, used to build resource names and labels.
     pub name: ClusterName,
+    /// The cluster's namespace as a type-safe value, captured during validation.
+    pub namespace: NamespaceName,
+    /// The cluster's UID as a type-safe value, captured during validation (used for owner
+    /// references).
+    pub uid: Uid,
     /// The product version as a valid label value, for the recommended `app.kubernetes.io/version`
     /// label. Derived from the resolved image's app-version label value.
     pub product_version: ProductVersion,
@@ -131,8 +138,9 @@ pub struct ValidatedCluster {
 
 impl ValidatedCluster {
     pub fn new(
-        airflow: &v1alpha2::AirflowCluster,
         name: ClusterName,
+        namespace: NamespaceName,
+        uid: Uid,
         image: ResolvedProductImage,
         cluster_config: ValidatedClusterConfig,
         role_groups: BTreeMap<AirflowRole, BTreeMap<RoleGroupName, AirflowRoleGroup>>,
@@ -145,12 +153,14 @@ impl ValidatedCluster {
         Self {
             // Capture only the identity fields needed to own child objects.
             metadata: ObjectMeta {
-                name: Some(airflow.name_any()),
-                namespace: airflow.namespace(),
-                uid: airflow.uid(),
+                name: Some(name.to_string()),
+                namespace: Some(namespace.to_string()),
+                uid: Some(uid.to_string()),
                 ..ObjectMeta::default()
             },
             name,
+            namespace,
+            uid,
             product_version,
             image,
             cluster_config,
@@ -159,11 +169,6 @@ impl ValidatedCluster {
         }
     }
 
-    /// The cluster's namespace, captured during validation.
-    pub fn namespace(&self) -> Option<String> {
-        self.metadata.namespace.clone()
-    }
-
     /// Whether the cluster has the given role configured (i.e. it has role groups for it).
     pub fn has_role(&self, role: &AirflowRole) -> bool {
         self.role_groups.contains_key(role)
@@ -356,13 +361,6 @@ impl NameIsValidLabelValue for ValidatedCluster {
 
 impl HasUid for ValidatedCluster {
     fn to_uid(&self) -> Uid {
-        Uid::from_str(
-            &self
-                .metadata
-                .uid
-                .clone()
-                .expect("the uid is captured during validation"),
-        )
-        .expect("the uid is a valid Kubernetes UID")
+        self.uid.clone()
     }
 }

rust/operator-binary/src/controller/validate.rs

@@ -16,6 +16,7 @@ use stackable_operator::{
     role_utils::{GenericRoleConfig, RoleGroup},
     v2::{
         builder::pod::container::{EnvVarName, EnvVarSet},
+        controller_utils::{get_namespace, get_uid},
         product_logging::framework::{
             VectorContainerLogConfig, validate_logging_configuration_for_container,
         },
@@ -53,6 +54,16 @@ pub enum Error {
         cluster_name: String,
     },
 
+    #[snafu(display("failed to resolve namespace"))]
+    ResolveNamespace {
+        source: stackable_operator::v2::controller_utils::Error,
+    },
+
+    #[snafu(display("failed to resolve uid"))]
+    ResolveUid {
+        source: stackable_operator::v2::controller_utils::Error,
+    },
+
     #[snafu(display("invalid role group name {role_group}"))]
     ParseRoleGroupName {
         source: stackable_operator::v2::macros::attributed_string_type::Error,
@@ -100,6 +111,8 @@ pub fn validate_cluster(
         ClusterName::from_str(&airflow.name_any()).with_context(|_| ParseClusterNameSnafu {
             cluster_name: airflow.name_any(),
         })?;
+    let namespace = get_namespace(airflow).context(ResolveNamespaceSnafu)?;
+    let uid = get_uid(airflow).context(ResolveUidSnafu)?;
 
     // The Vector aggregator discovery ConfigMap name. Validity is already enforced by the
     // `ConfigMapName` type on the CRD; it is only required when the Vector agent is enabled.
@@ -162,8 +175,9 @@ pub fn validate_cluster(
         database_connection_details(airflow);
 
     Ok(ValidatedCluster::new(
-        airflow,
         cluster_name,
+        namespace,
+        uid,
         resolved_product_image,
         ValidatedClusterConfig {
             executor: airflow.spec.executor.clone(),