From 72204ad7b197e7f45227fdd880044ddb008bf6d7 Mon Sep 17 00:00:00 2001
From: Malte Sander <malte.sander.it@gmail.com>
Date: Wed, 12 Mar 2025 11:04:36 +0100
Subject: [PATCH 1/5] update test and doc versions

---
 docs/modules/airflow/pages/usage-guide/security.adoc  | 4 ++--
 docs/modules/airflow/partials/supported-versions.adoc | 3 +--
 tests/test-definition.yaml                            | 9 ++++-----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/docs/modules/airflow/pages/usage-guide/security.adoc b/docs/modules/airflow/pages/usage-guide/security.adoc
index 91bfc18d..3a5de440 100644
--- a/docs/modules/airflow/pages/usage-guide/security.adoc
+++ b/docs/modules/airflow/pages/usage-guide/security.adoc
@@ -37,7 +37,7 @@ metadata:
   name: airflow-with-ldap
 spec:
   image:
-    productVersion: 2.10.2
+    productVersion: 2.10.4
   clusterConfig:
     authentication:
       - authenticationClass: ldap    # <1>
@@ -71,7 +71,7 @@ metadata:
   name: airflow-with-oidc
 spec:
   image:
-    productVersion: 2.10.2
+    productVersion: 2.10.4
   clusterConfig:
     authentication:
     - authenticationClass: keycloak                       # <1>
diff --git a/docs/modules/airflow/partials/supported-versions.adoc b/docs/modules/airflow/partials/supported-versions.adoc
index e2332a86..3941fa52 100644
--- a/docs/modules/airflow/partials/supported-versions.adoc
+++ b/docs/modules/airflow/partials/supported-versions.adoc
@@ -2,6 +2,5 @@
 // This is a separate file, since it is used by both the direct Airflow-Operator documentation, and the overarching
 // Stackable Platform documentation.
 
-- 2.10.2 (experimental)
+- 2.10.4
 - 2.9.3 (LTS)
-- 2.9.2 (deprecated)
diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml
index adcf92fb..82f11035 100644
--- a/tests/test-definition.yaml
+++ b/tests/test-definition.yaml
@@ -7,16 +7,15 @@
 dimensions:
   - name: airflow
     values:
-      - 2.9.2
       - 2.9.3
-      - 2.10.2
+      - 2.10.4
       # To use a custom image, add a comma and the full name after the product version
-      # - 2.8.1,oci.stackable.tech/sandbox/airflow:2.8.1-stackable0.0.0-dev
+      # - 2.9.3,oci.stackable.tech/sandbox/airflow:2.9.3-stackable0.0.0-dev
   - name: airflow-latest
     values:
-      - 2.10.2
+      - 2.10.4
       # To use a custom image, add a comma and the full name after the product version
-      # - 2.8.1,oci.stackable.tech/sandbox/airflow:2.8.1-stackable0.0.0-dev
+      # - 2.9.3,oci.stackable.tech/sandbox/airflow:2.9.3-stackable0.0.0-dev
   - name: opa-latest
     values:
       - 1.0.1

From 2b652dcb3a7e7c79003e95b5bda0838aea238e44 Mon Sep 17 00:00:00 2001
From: Malte Sander <malte.sander.it@gmail.com>
Date: Wed, 12 Mar 2025 11:08:23 +0100
Subject: [PATCH 2/5] adapted changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9cd846aa..4b83544b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,17 +7,23 @@
 - Run a `containerdebug` process in the background of each Airflow container to collect debugging information ([#557]).
 - Aggregate emitted Kubernetes events on the CustomResources ([#571]).
 - Add OPA support ([#573]).
+- Support for `2.10.4` ([#594]).
 
 ### Changed
 
 - Bump stackable-operator to 0.87.0 and stackable-versioned to 0.6.0 ([#591]).
 - Default to OCI for image metadata and product image selection ([#572]).
 
+### Removed
+
+- Support for `2.9.2` and `2.10.2` (experimental) ([#594]).
+
 [#557]: https://github.com/stackabletech/airflow-operator/pull/557
 [#571]: https://github.com/stackabletech/airflow-operator/pull/571
 [#572]: https://github.com/stackabletech/airflow-operator/pull/572
 [#573]: https://github.com/stackabletech/airflow-operator/pull/573
 [#591]: https://github.com/stackabletech/airflow-operator/pull/591
+[#594]: https://github.com/stackabletech/airflow-operator/pull/594
 
 ## [24.11.1] - 2025-01-09
 

From 133ab2f4bfe36a0ce9781700a2f663a7fa195063 Mon Sep 17 00:00:00 2001
From: Malte Sander <malte.sander.it@gmail.com>
Date: Wed, 12 Mar 2025 14:37:05 +0100
Subject: [PATCH 3/5] Apply suggestions from code review

Co-authored-by: Nick <10092581+NickLarsenNZ@users.noreply.github.com>
---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b83544b..229582b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@
 - Run a `containerdebug` process in the background of each Airflow container to collect debugging information ([#557]).
 - Aggregate emitted Kubernetes events on the CustomResources ([#571]).
 - Add OPA support ([#573]).
-- Support for `2.10.4` ([#594]).
+- Add support for `2.10.4` ([#594]).
 
 ### Changed
 
@@ -16,7 +16,7 @@
 
 ### Removed
 
-- Support for `2.9.2` and `2.10.2` (experimental) ([#594]).
+- Remove support for `2.9.2` and `2.10.2` (experimental) ([#594]).
 
 [#557]: https://github.com/stackabletech/airflow-operator/pull/557
 [#571]: https://github.com/stackabletech/airflow-operator/pull/571

From 444ade1ff99655f417bbdd448721c90662c1e82a Mon Sep 17 00:00:00 2001
From: Malte Sander <malte.sander.it@gmail.com>
Date: Wed, 12 Mar 2025 17:15:51 +0100
Subject: [PATCH 4/5] bump 2.9.3 to 2.10.4 where applicable

---
 .../example-airflow-dags-configmap.yaml       |  2 +-
 .../examples/example-airflow-gitsync.yaml     |  2 +-
 .../examples/example-airflow-incluster.yaml   |  2 +-
 ...irflow-kubernetes-executor-s3-logging.yaml |  2 +-
 ...e-airflow-kubernetes-executor-s3-xcom.yaml |  2 +-
 .../getting_started/code/airflow.yaml         |  2 +-
 .../simple-airflow-cluster-dags-cmap.yaml     |  2 +-
 ...ple-airflow-cluster-ldap-insecure-tls.yaml |  2 +-
 examples/simple-airflow-cluster-ldap.yaml     |  2 +-
 examples/simple-airflow-cluster.yaml          |  2 +-
 rust/operator-binary/src/crd/affinity.rs      |  4 +-
 rust/operator-binary/src/crd/git_sync.rs      |  6 +-
 rust/operator-binary/src/crd/mod.rs           |  4 +-
 tests/test-definition.yaml                    | 94 +++++++++----------
 14 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/docs/modules/airflow/examples/example-airflow-dags-configmap.yaml b/docs/modules/airflow/examples/example-airflow-dags-configmap.yaml
index 32d462aa..d46d6a23 100644
--- a/docs/modules/airflow/examples/example-airflow-dags-configmap.yaml
+++ b/docs/modules/airflow/examples/example-airflow-dags-configmap.yaml
@@ -5,7 +5,7 @@ metadata:
   name: airflow
 spec:
   image:
-    productVersion: 2.9.3
+    productVersion: 2.10.4
   clusterConfig:
     loadExamples: false
     exposeConfig: false
diff --git a/docs/modules/airflow/examples/example-airflow-gitsync.yaml b/docs/modules/airflow/examples/example-airflow-gitsync.yaml
index 70746894..6e5cd120 100644
--- a/docs/modules/airflow/examples/example-airflow-gitsync.yaml
+++ b/docs/modules/airflow/examples/example-airflow-gitsync.yaml
@@ -5,7 +5,7 @@ metadata:
   name: airflow
 spec:
   image:
-    productVersion: "2.9.3"
+    productVersion: "2.10.4"
   clusterConfig:
     loadExamples: false
     exposeConfig: false
diff --git a/docs/modules/airflow/examples/example-airflow-incluster.yaml b/docs/modules/airflow/examples/example-airflow-incluster.yaml
index d7831e49..f5313d19 100644
--- a/docs/modules/airflow/examples/example-airflow-incluster.yaml
+++ b/docs/modules/airflow/examples/example-airflow-incluster.yaml
@@ -5,7 +5,7 @@ metadata:
   name: airflow
 spec:
   image:
-    productVersion: 2.9.3
+    productVersion: 2.10.4
   clusterConfig:
     loadExamples: false
     exposeConfig: false
diff --git a/docs/modules/airflow/examples/example-airflow-kubernetes-executor-s3-logging.yaml b/docs/modules/airflow/examples/example-airflow-kubernetes-executor-s3-logging.yaml
index 4f5db434..c629b902 100644
--- a/docs/modules/airflow/examples/example-airflow-kubernetes-executor-s3-logging.yaml
+++ b/docs/modules/airflow/examples/example-airflow-kubernetes-executor-s3-logging.yaml
@@ -4,7 +4,7 @@ metadata:
   name: airflow
 spec:
   image:
-    productVersion: 2.9.3
+    productVersion: 2.10.4
   clusterConfig: {}
   webservers:
     envOverrides: &envOverrides
diff --git a/docs/modules/airflow/examples/example-airflow-kubernetes-executor-s3-xcom.yaml b/docs/modules/airflow/examples/example-airflow-kubernetes-executor-s3-xcom.yaml
index 22fb619c..0a903bf9 100644
--- a/docs/modules/airflow/examples/example-airflow-kubernetes-executor-s3-xcom.yaml
+++ b/docs/modules/airflow/examples/example-airflow-kubernetes-executor-s3-xcom.yaml
@@ -4,7 +4,7 @@ metadata:
   name: airflow
 spec:
   image:
-    productVersion: 2.9.3
+    productVersion: 2.10.4
   clusterConfig: {}
   webservers:
     envOverrides: &envOverrides
diff --git a/docs/modules/airflow/examples/getting_started/code/airflow.yaml b/docs/modules/airflow/examples/getting_started/code/airflow.yaml
index 9389942d..b984bdff 100644
--- a/docs/modules/airflow/examples/getting_started/code/airflow.yaml
+++ b/docs/modules/airflow/examples/getting_started/code/airflow.yaml
@@ -5,7 +5,7 @@ metadata:
   name: airflow
 spec:
   image:
-    productVersion: 2.9.3
+    productVersion: 2.10.4
   clusterConfig:
     loadExamples: true
     exposeConfig: false
diff --git a/examples/simple-airflow-cluster-dags-cmap.yaml b/examples/simple-airflow-cluster-dags-cmap.yaml
index e9f86d3a..b7862647 100644
--- a/examples/simple-airflow-cluster-dags-cmap.yaml
+++ b/examples/simple-airflow-cluster-dags-cmap.yaml
@@ -82,7 +82,7 @@ metadata:
   name: airflow-dags-cmap
 spec:
   image:
-    productVersion: 2.9.3
+    productVersion: 2.10.4
   clusterConfig:
     loadExamples: false
     exposeConfig: false
diff --git a/examples/simple-airflow-cluster-ldap-insecure-tls.yaml b/examples/simple-airflow-cluster-ldap-insecure-tls.yaml
index 7d58cc06..4e848c39 100644
--- a/examples/simple-airflow-cluster-ldap-insecure-tls.yaml
+++ b/examples/simple-airflow-cluster-ldap-insecure-tls.yaml
@@ -148,7 +148,7 @@ metadata:
   name: airflow-insecure-tls
 spec:
   image:
-    productVersion: 2.9.3
+    productVersion: 2.10.4
   clusterConfig:
     loadExamples: true
     exposeConfig: true
diff --git a/examples/simple-airflow-cluster-ldap.yaml b/examples/simple-airflow-cluster-ldap.yaml
index 64232a54..cca95778 100644
--- a/examples/simple-airflow-cluster-ldap.yaml
+++ b/examples/simple-airflow-cluster-ldap.yaml
@@ -146,7 +146,7 @@ metadata:
   name: airflow-with-ldap-server-veri-tls
 spec:
   image:
-    productVersion: 2.9.3
+    productVersion: 2.10.4
   clusterConfig:
     loadExamples: true
     exposeConfig: true
diff --git a/examples/simple-airflow-cluster.yaml b/examples/simple-airflow-cluster.yaml
index e28554de..9e11d708 100644
--- a/examples/simple-airflow-cluster.yaml
+++ b/examples/simple-airflow-cluster.yaml
@@ -22,7 +22,7 @@ metadata:
   name: airflow
 spec:
   image:
-    productVersion: 2.9.3
+    productVersion: 2.10.4
   clusterConfig:
     loadExamples: true
     exposeConfig: false
diff --git a/rust/operator-binary/src/crd/affinity.rs b/rust/operator-binary/src/crd/affinity.rs
index a8a0bb66..ad712423 100644
--- a/rust/operator-binary/src/crd/affinity.rs
+++ b/rust/operator-binary/src/crd/affinity.rs
@@ -69,7 +69,7 @@ mod tests {
           name: airflow
         spec:
           image:
-            productVersion: 2.9.3
+            productVersion: 2.10.4
           clusterConfig:
             credentialsSecret: airflow-credentials
           webservers:
@@ -163,7 +163,7 @@ mod tests {
           name: airflow
         spec:
           image:
-            productVersion: 2.9.3
+            productVersion: 2.10.4
           clusterConfig:
             credentialsSecret: airflow-credentials
           webservers:
diff --git a/rust/operator-binary/src/crd/git_sync.rs b/rust/operator-binary/src/crd/git_sync.rs
index 951c99c6..ee6e8a04 100644
--- a/rust/operator-binary/src/crd/git_sync.rs
+++ b/rust/operator-binary/src/crd/git_sync.rs
@@ -118,7 +118,7 @@ mod tests {
           name: airflow
         spec:
           image:
-            productVersion: 2.9.3
+            productVersion: 2.10.4
           clusterConfig:
             loadExamples: false
             exposeConfig: false
@@ -164,7 +164,7 @@ mod tests {
           name: airflow
         spec:
           image:
-            productVersion: 2.9.3
+            productVersion: 2.10.4
           clusterConfig:
             loadExamples: false
             exposeConfig: false
@@ -237,7 +237,7 @@ mod tests {
           name: airflow
         spec:
           image:
-            productVersion: 2.9.3
+            productVersion: 2.10.4
           clusterConfig:
             loadExamples: false
             exposeConfig: false
diff --git a/rust/operator-binary/src/crd/mod.rs b/rust/operator-binary/src/crd/mod.rs
index 8b186195..5ff5926d 100644
--- a/rust/operator-binary/src/crd/mod.rs
+++ b/rust/operator-binary/src/crd/mod.rs
@@ -863,7 +863,7 @@ mod tests {
           name: airflow
         spec:
           image:
-            productVersion: 2.9.3
+            productVersion: 2.10.4
           clusterConfig:
             loadExamples: true
             exposeConfig: true
@@ -887,7 +887,7 @@ mod tests {
         let resolved_airflow_image: ResolvedProductImage =
             cluster.spec.image.resolve("airflow", "0.0.0-dev");
 
-        assert_eq!("2.9.3", &resolved_airflow_image.product_version);
+        assert_eq!("2.10.4", &resolved_airflow_image.product_version);
 
         assert_eq!("KubernetesExecutor", cluster.spec.executor.to_string());
         assert!(cluster.spec.cluster_config.load_examples);
diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml
index 82f11035..3dd72c6a 100644
--- a/tests/test-definition.yaml
+++ b/tests/test-definition.yaml
@@ -29,60 +29,60 @@ dimensions:
       - "false"
   - name: executor
     values:
-      - celery
+      #- celery
       - kubernetes
 tests:
-  - name: smoke
-    dimensions:
-      - airflow
-      - openshift
-      - executor
-  - name: mount-dags-configmap
-    dimensions:
-      - airflow-latest
-      - openshift
-      - executor
+  # - name: smoke
+  #   dimensions:
+  #     - airflow
+  #     - openshift
+  #     - executor
+  # - name: mount-dags-configmap
+  #   dimensions:
+  #     - airflow-latest
+  #     - openshift
+  #     - executor
   - name: mount-dags-gitsync
     dimensions:
       - airflow-latest
       - openshift
       - executor
-  - name: ldap
-    dimensions:
-      - airflow-latest
-      - openshift
-      - ldap-authentication
-      - executor
-  - name: oidc
-    dimensions:
-      - airflow
-      - openshift
-  - name: opa
-    dimensions:
-      - airflow
-      - opa-latest
-      - openshift
-  - name: resources
-    dimensions:
-      - airflow-latest
-      - openshift
-  - name: orphaned-resources
-    dimensions:
-      - airflow-latest
-      - openshift
-  - name: logging
-    dimensions:
-      - airflow
-      - openshift
-      - executor
-  - name: cluster-operation
-    dimensions:
-      - airflow-latest
-      - openshift
-  - name: overrides
-    dimensions:
-      - airflow-latest
-      - openshift
+  # - name: ldap
+  #   dimensions:
+  #     - airflow-latest
+  #     - openshift
+  #     - ldap-authentication
+  #     - executor
+  # - name: oidc
+  #   dimensions:
+  #     - airflow
+  #     - openshift
+  # - name: opa
+  #   dimensions:
+  #     - airflow
+  #     - opa-latest
+  #     - openshift
+  # - name: resources
+  #   dimensions:
+  #     - airflow-latest
+  #     - openshift
+  # - name: orphaned-resources
+  #   dimensions:
+  #     - airflow-latest
+  #     - openshift
+  # - name: logging
+  #   dimensions:
+  #     - airflow
+  #     - openshift
+  #     - executor
+  # - name: cluster-operation
+  #   dimensions:
+  #     - airflow-latest
+  #     - openshift
+  # - name: overrides
+  #   dimensions:
+  #     - airflow-latest
+  #     - openshift
 suites:
   - name: nightly
     # Run nightly with the latest airflow

From cd3390873199670131ed0f1fe0608f1409ca92b8 Mon Sep 17 00:00:00 2001
From: Malte Sander <malte.sander.it@gmail.com>
Date: Wed, 12 Mar 2025 17:17:07 +0100
Subject: [PATCH 5/5] enable tests

---
 tests/test-definition.yaml | 94 +++++++++++++++++++-------------------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml
index 3dd72c6a..82f11035 100644
--- a/tests/test-definition.yaml
+++ b/tests/test-definition.yaml
@@ -29,60 +29,60 @@ dimensions:
       - "false"
   - name: executor
     values:
-      #- celery
+      - celery
       - kubernetes
 tests:
-  # - name: smoke
-  #   dimensions:
-  #     - airflow
-  #     - openshift
-  #     - executor
-  # - name: mount-dags-configmap
-  #   dimensions:
-  #     - airflow-latest
-  #     - openshift
-  #     - executor
+  - name: smoke
+    dimensions:
+      - airflow
+      - openshift
+      - executor
+  - name: mount-dags-configmap
+    dimensions:
+      - airflow-latest
+      - openshift
+      - executor
   - name: mount-dags-gitsync
     dimensions:
       - airflow-latest
       - openshift
       - executor
-  # - name: ldap
-  #   dimensions:
-  #     - airflow-latest
-  #     - openshift
-  #     - ldap-authentication
-  #     - executor
-  # - name: oidc
-  #   dimensions:
-  #     - airflow
-  #     - openshift
-  # - name: opa
-  #   dimensions:
-  #     - airflow
-  #     - opa-latest
-  #     - openshift
-  # - name: resources
-  #   dimensions:
-  #     - airflow-latest
-  #     - openshift
-  # - name: orphaned-resources
-  #   dimensions:
-  #     - airflow-latest
-  #     - openshift
-  # - name: logging
-  #   dimensions:
-  #     - airflow
-  #     - openshift
-  #     - executor
-  # - name: cluster-operation
-  #   dimensions:
-  #     - airflow-latest
-  #     - openshift
-  # - name: overrides
-  #   dimensions:
-  #     - airflow-latest
-  #     - openshift
+  - name: ldap
+    dimensions:
+      - airflow-latest
+      - openshift
+      - ldap-authentication
+      - executor
+  - name: oidc
+    dimensions:
+      - airflow
+      - openshift
+  - name: opa
+    dimensions:
+      - airflow
+      - opa-latest
+      - openshift
+  - name: resources
+    dimensions:
+      - airflow-latest
+      - openshift
+  - name: orphaned-resources
+    dimensions:
+      - airflow-latest
+      - openshift
+  - name: logging
+    dimensions:
+      - airflow
+      - openshift
+      - executor
+  - name: cluster-operation
+    dimensions:
+      - airflow-latest
+      - openshift
+  - name: overrides
+    dimensions:
+      - airflow-latest
+      - openshift
 suites:
   - name: nightly
     # Run nightly with the latest airflow