chore: migrate to new container builder

Author: maltesander

rust/operator-binary/src/controller/build/resource/executor.rs

@@ -8,15 +8,15 @@ use stackable_operator::{
     builder::{
         configmap::ConfigMapBuilder,
         meta::ObjectMetaBuilder,
-        pod::{PodBuilder, container::ContainerBuilder, security::PodSecurityContextBuilder},
+        pod::{PodBuilder, security::PodSecurityContextBuilder},
     },
     crd::git_sync,
     k8s_openapi::{
         DeepMerge,
         api::core::v1::{ConfigMap, PodTemplateSpec},
     },
     kvp::{Label, LabelError},
-    v2::builder::meta::ownerreference_from_resource,
+    v2::builder::{meta::ownerreference_from_resource, pod::container::new_container_builder},
 };
 
 use crate::{
@@ -42,11 +42,6 @@ use crate::{
 
 #[derive(Snafu, Debug)]
 pub enum Error {
-    #[snafu(display("invalid container name"))]
-    InvalidContainerName {
-        source: stackable_operator::builder::pod::container::Error,
-    },
-
     #[snafu(display("failed to configure graceful shutdown"))]
     GracefulShutdown {
         source: crate::controller::build::graceful_shutdown::Error,
@@ -114,8 +109,7 @@ pub fn build_executor_template_config_map(
 
     // N.B. this "base" name is an airflow requirement and should not be changed!
     // See https://airflow.apache.org/docs/apache-airflow-providers-cncf-kubernetes/8.4.0/kubernetes_executor.html#base-image
-    let mut airflow_container =
-        ContainerBuilder::new(&Container::Base.to_string()).context(InvalidContainerNameSnafu)?;
+    let mut airflow_container = new_container_builder(&Container::Base.to_container_name());
 
     add_authentication_volumes_and_volume_mounts(
         authentication_config,

rust/operator-binary/src/controller/build/resource/statefulset.rs

@@ -4,7 +4,6 @@ use stackable_operator::{
         meta::ObjectMetaBuilder,
         pod::{
             PodBuilder,
-            container::ContainerBuilder,
             resources::ResourceRequirementsBuilder,
             security::PodSecurityContextBuilder,
             volume::{
@@ -25,7 +24,10 @@ use stackable_operator::{
     kube::{ResourceExt, api::ObjectMeta},
     kvp::{Annotation, Label, LabelError},
     utils::COMMON_BASH_TRAP_FUNCTIONS,
-    v2::{builder::meta::ownerreference_from_resource, types::operator::RoleGroupName},
+    v2::{
+        builder::{meta::ownerreference_from_resource, pod::container::new_container_builder},
+        types::operator::RoleGroupName,
+    },
 };
 
 use crate::{
@@ -46,19 +48,14 @@ use crate::{
     controller_commons::{self, CONFIG_VOLUME_NAME, LOG_CONFIG_VOLUME_NAME, LOG_VOLUME_NAME},
     crd::{
         AirflowExecutor, AirflowRole, CONFIG_PATH, Container, HTTP_PORT_NAME, LISTENER_VOLUME_DIR,
-        LISTENER_VOLUME_NAME, LOG_CONFIG_DIR, METRICS_PORT, METRICS_PORT_NAME, STACKABLE_LOG_DIR,
-        TEMPLATE_LOCATION, TEMPLATE_VOLUME_NAME,
+        LISTENER_VOLUME_NAME, LOG_CONFIG_DIR, METRICS_CONTAINER_NAME, METRICS_PORT,
+        METRICS_PORT_NAME, STACKABLE_LOG_DIR, TEMPLATE_LOCATION, TEMPLATE_VOLUME_NAME,
     },
 };
 
 #[derive(Snafu, Debug)]
 #[snafu(visibility(pub(crate)))]
 pub enum Error {
-    #[snafu(display("invalid container name"))]
-    InvalidContainerName {
-        source: stackable_operator::builder::pod::container::Error,
-    },
-
     #[snafu(display("failed to configure graceful shutdown"))]
     GracefulShutdown {
         source: crate::controller::build::graceful_shutdown::Error,
@@ -154,8 +151,7 @@ pub fn build_server_rolegroup_statefulset(
         .service_account_name(service_account.name_any())
         .security_context(PodSecurityContextBuilder::new().fs_group(1000).build());
 
-    let mut airflow_container = ContainerBuilder::new(&Container::Airflow.to_string())
-        .context(InvalidContainerNameSnafu)?;
+    let mut airflow_container = new_container_builder(&Container::Airflow.to_container_name());
 
     add_authentication_volumes_and_volume_mounts(
         authentication_config,
@@ -283,8 +279,7 @@ pub fn build_server_rolegroup_statefulset(
 
     pb.add_container(airflow_container.build());
 
-    let metrics_container = ContainerBuilder::new("metrics")
-        .context(InvalidContainerNameSnafu)?
+    let metrics_container = new_container_builder(&METRICS_CONTAINER_NAME)
         .image_from_product_image(resolved_product_image)
         .command(vec![
             "/bin/bash".to_string(),

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

@@ -42,7 +42,10 @@ use stackable_operator::{
         role_utils::GenericCommonConfig,
         types::{
             common::Port,
-            kubernetes::{ConfigMapName, ListenerClassName, ListenerName, SecretName, VolumeName},
+            kubernetes::{
+                ConfigMapName, ContainerName, ListenerClassName, ListenerName, SecretName,
+                VolumeName,
+            },
         },
     },
     versioned::versioned,
@@ -90,6 +93,7 @@ pub const HTTP_PORT_NAME: &str = "http";
 pub const HTTP_PORT: Port = Port(8080);
 pub const METRICS_PORT_NAME: &str = "metrics";
 pub const METRICS_PORT: Port = Port(9102);
+stackable_operator::constant!(pub METRICS_CONTAINER_NAME: ContainerName = "metrics");
 
 const DEFAULT_AIRFLOW_GRACEFUL_SHUTDOWN_TIMEOUT: Duration = Duration::from_minutes_unchecked(2);
 const DEFAULT_WORKER_GRACEFUL_SHUTDOWN_TIMEOUT: Duration = Duration::from_minutes_unchecked(5);
@@ -828,6 +832,14 @@ pub enum Container {
     GitSync,
 }
 
+impl Container {
+    /// The type-safe container name for this variant (matching its kebab-case serialization).
+    pub fn to_container_name(&self) -> ContainerName {
+        ContainerName::from_str(&self.to_string())
+            .expect("a Container variant name is a valid container name")
+    }
+}
+
 #[derive(Clone, Debug, Default, Fragment, JsonSchema, PartialEq)]
 #[fragment_attrs(
     derive(