fix: Allow multiple Airflows in the same namespace to use Kubernetes executors

Author: sbernauer

CHANGELOG.md

@@ -10,6 +10,9 @@
 
 - Don't panic on invalid authorization config. Previously, a missing OPA ConfigMap would crash the operator ([#667]).
 - Fix OPA authorization for Airflow 3. Airflow 3 needs to be configured via env variables, the operator now does this correctly ([#668]).
+- Allow multiple Airflows in the same namespace to use Kubernetes executors.
+  Previously, the operator would always use the same name for the executor Pod template ConfigMap.
+  In case you had multiple Airflows, the two "fought" over writing to that ConfigMap.
 
 [#667]: https://github.com/stackabletech/airflow-operator/pull/667
 [#668]: https://github.com/stackabletech/airflow-operator/pull/668

rust/operator-binary/src/airflow_controller.rs

@@ -88,8 +88,7 @@ use crate::{
         AirflowConfigOptions, AirflowExecutor, AirflowRole, CONFIG_PATH, Container, ExecutorConfig,
         ExecutorConfigFragment, HTTP_PORT, HTTP_PORT_NAME, LISTENER_VOLUME_DIR,
         LISTENER_VOLUME_NAME, LOG_CONFIG_DIR, METRICS_PORT, METRICS_PORT_NAME, OPERATOR_NAME,
-        STACKABLE_LOG_DIR, TEMPLATE_CONFIGMAP_NAME, TEMPLATE_LOCATION, TEMPLATE_NAME,
-        TEMPLATE_VOLUME_NAME,
+        STACKABLE_LOG_DIR, TEMPLATE_LOCATION, TEMPLATE_NAME, TEMPLATE_VOLUME_NAME,
         authentication::{
             AirflowAuthenticationClassResolved, AirflowClientAuthenticationDetailsResolved,
         },
@@ -1110,7 +1109,7 @@ fn build_server_rolegroup_statefulset(
     if let AirflowExecutor::KubernetesExecutor { .. } = executor {
         pb.add_volume(
             VolumeBuilder::new(TEMPLATE_VOLUME_NAME)
-                .with_config_map(TEMPLATE_CONFIGMAP_NAME)
+                .with_config_map(airflow.executor_template_configmap_name())
                 .build(),
         )
         .context(AddVolumeSnafu)?;
@@ -1329,7 +1328,7 @@ fn build_executor_template_config_map(
         .metadata(
             ObjectMetaBuilder::new()
                 .name_and_namespace(airflow)
-                .name(TEMPLATE_CONFIGMAP_NAME)
+                .name(airflow.executor_template_configmap_name())
                 .ownerreference_from_resource(airflow, None, Some(true))
                 .context(ObjectMissingMetadataForOwnerRefSnafu)?
                 .with_recommended_labels(build_recommended_labels(

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

@@ -70,7 +70,6 @@ pub const AIRFLOW_HOME: &str = "/stackable/airflow";
 pub const AIRFLOW_CONFIG_FILENAME: &str = "webserver_config.py";
 
 pub const TEMPLATE_VOLUME_NAME: &str = "airflow-executor-pod-template";
-pub const TEMPLATE_CONFIGMAP_NAME: &str = "airflow-executor-pod-template";
 pub const TEMPLATE_LOCATION: &str = "/templates";
 pub const TEMPLATE_NAME: &str = "airflow_executor_pod_template.yaml";
 
@@ -379,6 +378,10 @@ impl v1alpha1::AirflowCluster {
         self.spec.cluster_config.volume_mounts.clone()
     }
 
+    pub fn executor_template_configmap_name(&self) -> String {
+        format!("{}-executor-pod-template", self.name_any())
+    }
+
     /// Retrieve and merge resource configs for role and role groups
     pub fn merged_config(
         &self,