From 719dcd2a0f71f002cf899ba6fa1a3a6da89c1187 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Mon, 26 May 2025 10:39:46 +0200 Subject: [PATCH] chore: Fix listenerClass references in tests and docs --- .../airflow/examples/example-airflow-dags-configmap.yaml | 2 ++ docs/modules/airflow/examples/example-airflow-incluster.yaml | 2 ++ .../example-airflow-kubernetes-executor-s3-logging.yaml | 2 ++ .../examples/example-airflow-kubernetes-executor-s3-xcom.yaml | 2 ++ .../modules/airflow/examples/getting_started/code/airflow.yaml | 3 ++- examples/simple-airflow-cluster-dags-cmap.yaml | 2 ++ examples/simple-airflow-cluster-ldap-insecure-tls.yaml | 2 ++ examples/simple-airflow-cluster-ldap.yaml | 2 ++ examples/simple-airflow-cluster.yaml | 2 ++ .../kuttl/cluster-operation/08-install-airflow.yaml.j2 | 1 + .../templates/kuttl/cluster-operation/10-pause-airflow.yaml.j2 | 1 + .../templates/kuttl/cluster-operation/20-stop-airflow.yaml.j2 | 1 + .../kuttl/cluster-operation/30-restart-airflow.yaml.j2 | 1 + tests/templates/kuttl/ldap/60-install-airflow-cluster.yaml.j2 | 1 + .../templates/kuttl/logging/41-install-airflow-cluster.yaml.j2 | 1 + .../mount-dags-configmap/30-install-airflow-cluster.yaml.j2 | 1 + .../mount-dags-gitsync/30-install-airflow-cluster.yaml.j2 | 1 + tests/templates/kuttl/oidc/install-airflow.yaml.j2 | 1 + tests/templates/kuttl/opa/30-install-airflow.yaml.j2 | 1 + .../orphaned-resources/30-install-airflow-cluster.yaml.j2 | 1 + tests/templates/kuttl/overrides/10-install-airflow.yaml.j2 | 3 ++- tests/templates/kuttl/overrides/20-install-airflow2.yaml.j2 | 3 ++- .../kuttl/resources/30-install-airflow-cluster.yaml.j2 | 1 + tests/templates/kuttl/smoke/40-install-airflow-cluster.yaml.j2 | 1 + 24 files changed, 35 insertions(+), 3 deletions(-) diff --git a/docs/modules/airflow/examples/example-airflow-dags-configmap.yaml b/docs/modules/airflow/examples/example-airflow-dags-configmap.yaml index a12f0262..9e092d7f 100644 --- a/docs/modules/airflow/examples/example-airflow-dags-configmap.yaml +++ b/docs/modules/airflow/examples/example-airflow-dags-configmap.yaml @@ -19,6 +19,8 @@ spec: mountPath: /dags/test_airflow_dag.py # <6> subPath: test_airflow_dag.py # <7> webservers: + config: + listenerClass: external-unstable roleGroups: default: envOverrides: diff --git a/docs/modules/airflow/examples/example-airflow-incluster.yaml b/docs/modules/airflow/examples/example-airflow-incluster.yaml index 6289109f..6e5e14fe 100644 --- a/docs/modules/airflow/examples/example-airflow-incluster.yaml +++ b/docs/modules/airflow/examples/example-airflow-incluster.yaml @@ -11,6 +11,8 @@ spec: exposeConfig: false credentialsSecret: simple-airflow-credentials webservers: + config: + listenerClass: external-unstable roleGroups: default: envOverrides: 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 46b7c873..9aea1a22 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 @@ -7,6 +7,8 @@ spec: productVersion: 2.10.5 clusterConfig: {} webservers: + config: + listenerClass: external-unstable envOverrides: &envOverrides AIRFLOW__LOGGING__REMOTE_LOGGING: "True" AIRFLOW__LOGGING__REMOTE_BASE_LOG_FOLDER: s3:///airflow-task-logs/ 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 3edfc4c6..99778018 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 @@ -7,6 +7,8 @@ spec: productVersion: 2.10.5 clusterConfig: {} webservers: + config: + listenerClass: external-unstable envOverrides: &envOverrides AIRFLOW__CORE__XCOM_BACKEND: airflow.providers.common.io.xcom.backend.XComObjectStorageBackend # The connection id is obtained from the user part of the url that you will provide diff --git a/docs/modules/airflow/examples/getting_started/code/airflow.yaml b/docs/modules/airflow/examples/getting_started/code/airflow.yaml index d44290ed..7fd72a9a 100644 --- a/docs/modules/airflow/examples/getting_started/code/airflow.yaml +++ b/docs/modules/airflow/examples/getting_started/code/airflow.yaml @@ -9,9 +9,10 @@ spec: clusterConfig: loadExamples: true exposeConfig: false - listenerClass: external-unstable credentialsSecret: simple-airflow-credentials webservers: + config: + listenerClass: external-unstable roleGroups: default: replicas: 1 diff --git a/examples/simple-airflow-cluster-dags-cmap.yaml b/examples/simple-airflow-cluster-dags-cmap.yaml index 37a72991..b5ed29cb 100644 --- a/examples/simple-airflow-cluster-dags-cmap.yaml +++ b/examples/simple-airflow-cluster-dags-cmap.yaml @@ -96,6 +96,8 @@ spec: mountPath: /dags/test_airflow_dag.py subPath: test_airflow_dag.py webservers: + config: + listenerClass: external-unstable roleGroups: default: envOverrides: diff --git a/examples/simple-airflow-cluster-ldap-insecure-tls.yaml b/examples/simple-airflow-cluster-ldap-insecure-tls.yaml index 4830da1d..196fe61c 100644 --- a/examples/simple-airflow-cluster-ldap-insecure-tls.yaml +++ b/examples/simple-airflow-cluster-ldap-insecure-tls.yaml @@ -157,6 +157,8 @@ spec: - authenticationClass: airflow-with-ldap-insecure-tls-ldap userRegistrationRole: Admin webservers: + config: + listenerClass: external-unstable roleGroups: default: replicas: 1 diff --git a/examples/simple-airflow-cluster-ldap.yaml b/examples/simple-airflow-cluster-ldap.yaml index ec811a7e..b34fd059 100644 --- a/examples/simple-airflow-cluster-ldap.yaml +++ b/examples/simple-airflow-cluster-ldap.yaml @@ -155,6 +155,8 @@ spec: - authenticationClass: airflow-with-ldap-server-veri-tls-ldap userRegistrationRole: Admin webservers: + config: + listenerClass: external-unstable roleGroups: default: replicas: 1 diff --git a/examples/simple-airflow-cluster.yaml b/examples/simple-airflow-cluster.yaml index 4c86be7d..d6844499 100644 --- a/examples/simple-airflow-cluster.yaml +++ b/examples/simple-airflow-cluster.yaml @@ -28,6 +28,8 @@ spec: exposeConfig: false credentialsSecret: simple-airflow-credentials webservers: + config: + listenerClass: external-unstable roleGroups: default: replicas: 1 diff --git a/tests/templates/kuttl/cluster-operation/08-install-airflow.yaml.j2 b/tests/templates/kuttl/cluster-operation/08-install-airflow.yaml.j2 index 9c825cee..bea56217 100644 --- a/tests/templates/kuttl/cluster-operation/08-install-airflow.yaml.j2 +++ b/tests/templates/kuttl/cluster-operation/08-install-airflow.yaml.j2 @@ -40,6 +40,7 @@ spec: credentialsSecret: test-airflow-credentials webservers: config: + listenerClass: external-unstable logging: enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }} roleGroups: diff --git a/tests/templates/kuttl/cluster-operation/10-pause-airflow.yaml.j2 b/tests/templates/kuttl/cluster-operation/10-pause-airflow.yaml.j2 index b28ac330..6bcbc9ef 100644 --- a/tests/templates/kuttl/cluster-operation/10-pause-airflow.yaml.j2 +++ b/tests/templates/kuttl/cluster-operation/10-pause-airflow.yaml.j2 @@ -27,6 +27,7 @@ spec: credentialsSecret: test-airflow-credentials webservers: config: + listenerClass: external-unstable logging: enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }} roleGroups: diff --git a/tests/templates/kuttl/cluster-operation/20-stop-airflow.yaml.j2 b/tests/templates/kuttl/cluster-operation/20-stop-airflow.yaml.j2 index e3b2a8cb..3f52a339 100644 --- a/tests/templates/kuttl/cluster-operation/20-stop-airflow.yaml.j2 +++ b/tests/templates/kuttl/cluster-operation/20-stop-airflow.yaml.j2 @@ -27,6 +27,7 @@ spec: credentialsSecret: test-airflow-credentials webservers: config: + listenerClass: external-unstable logging: enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }} roleGroups: diff --git a/tests/templates/kuttl/cluster-operation/30-restart-airflow.yaml.j2 b/tests/templates/kuttl/cluster-operation/30-restart-airflow.yaml.j2 index cc19e60b..56b2e3de 100644 --- a/tests/templates/kuttl/cluster-operation/30-restart-airflow.yaml.j2 +++ b/tests/templates/kuttl/cluster-operation/30-restart-airflow.yaml.j2 @@ -27,6 +27,7 @@ spec: credentialsSecret: test-airflow-credentials webservers: config: + listenerClass: external-unstable logging: enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }} roleGroups: diff --git a/tests/templates/kuttl/ldap/60-install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/ldap/60-install-airflow-cluster.yaml.j2 index f88c7135..c5423238 100644 --- a/tests/templates/kuttl/ldap/60-install-airflow-cluster.yaml.j2 +++ b/tests/templates/kuttl/ldap/60-install-airflow-cluster.yaml.j2 @@ -66,6 +66,7 @@ commands: userRegistrationRole: Admin webservers: config: + listenerClass: external-unstable logging: enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }} roleGroups: diff --git a/tests/templates/kuttl/logging/41-install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/logging/41-install-airflow-cluster.yaml.j2 index 12289fa0..dcc2956b 100644 --- a/tests/templates/kuttl/logging/41-install-airflow-cluster.yaml.j2 +++ b/tests/templates/kuttl/logging/41-install-airflow-cluster.yaml.j2 @@ -75,6 +75,7 @@ spec: gitFolder: dags webservers: config: + listenerClass: external-unstable resources: cpu: min: 200m diff --git a/tests/templates/kuttl/mount-dags-configmap/30-install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/mount-dags-configmap/30-install-airflow-cluster.yaml.j2 index 4a3e9225..b39e2bf8 100644 --- a/tests/templates/kuttl/mount-dags-configmap/30-install-airflow-cluster.yaml.j2 +++ b/tests/templates/kuttl/mount-dags-configmap/30-install-airflow-cluster.yaml.j2 @@ -86,6 +86,7 @@ spec: subPath: example_trigger_target_dag.py webservers: config: + listenerClass: external-unstable logging: enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }} roleGroups: diff --git a/tests/templates/kuttl/mount-dags-gitsync/30-install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/mount-dags-gitsync/30-install-airflow-cluster.yaml.j2 index 52fd40ee..c4c7cf86 100644 --- a/tests/templates/kuttl/mount-dags-gitsync/30-install-airflow-cluster.yaml.j2 +++ b/tests/templates/kuttl/mount-dags-gitsync/30-install-airflow-cluster.yaml.j2 @@ -81,6 +81,7 @@ spec: name: test-cm-gitsync webservers: config: + listenerClass: external-unstable logging: enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }} roleGroups: diff --git a/tests/templates/kuttl/oidc/install-airflow.yaml.j2 b/tests/templates/kuttl/oidc/install-airflow.yaml.j2 index 49e46e46..b0bbd5cc 100644 --- a/tests/templates/kuttl/oidc/install-airflow.yaml.j2 +++ b/tests/templates/kuttl/oidc/install-airflow.yaml.j2 @@ -59,6 +59,7 @@ spec: {% endif %} webservers: config: + listenerClass: external-unstable logging: enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }} roleGroups: diff --git a/tests/templates/kuttl/opa/30-install-airflow.yaml.j2 b/tests/templates/kuttl/opa/30-install-airflow.yaml.j2 index 6867c5dc..fe2d6786 100644 --- a/tests/templates/kuttl/opa/30-install-airflow.yaml.j2 +++ b/tests/templates/kuttl/opa/30-install-airflow.yaml.j2 @@ -47,6 +47,7 @@ spec: {% endif %} webservers: config: + listenerClass: external-unstable logging: enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }} configOverrides: diff --git a/tests/templates/kuttl/orphaned-resources/30-install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/orphaned-resources/30-install-airflow-cluster.yaml.j2 index 25ec9012..f9b16b29 100644 --- a/tests/templates/kuttl/orphaned-resources/30-install-airflow-cluster.yaml.j2 +++ b/tests/templates/kuttl/orphaned-resources/30-install-airflow-cluster.yaml.j2 @@ -40,6 +40,7 @@ spec: credentialsSecret: test-airflow-credentials webservers: config: + listenerClass: external-unstable logging: enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }} roleGroups: diff --git a/tests/templates/kuttl/overrides/10-install-airflow.yaml.j2 b/tests/templates/kuttl/overrides/10-install-airflow.yaml.j2 index 8fe1d7f3..018a7a74 100644 --- a/tests/templates/kuttl/overrides/10-install-airflow.yaml.j2 +++ b/tests/templates/kuttl/overrides/10-install-airflow.yaml.j2 @@ -46,9 +46,10 @@ spec: clusterConfig: loadExamples: true exposeConfig: false - listenerClass: external-unstable credentialsSecret: airflow-credentials webservers: + config: + listenerClass: external-unstable envOverrides: COMMON_VAR: role-value # overridden by role group below ROLE_VAR: role-value # only defined here at role level diff --git a/tests/templates/kuttl/overrides/20-install-airflow2.yaml.j2 b/tests/templates/kuttl/overrides/20-install-airflow2.yaml.j2 index c4a96ec0..ff9a631c 100644 --- a/tests/templates/kuttl/overrides/20-install-airflow2.yaml.j2 +++ b/tests/templates/kuttl/overrides/20-install-airflow2.yaml.j2 @@ -14,9 +14,10 @@ spec: clusterConfig: loadExamples: true exposeConfig: false - listenerClass: external-unstable credentialsSecret: airflow-credentials webservers: + config: + listenerClass: external-unstable roleGroups: default: replicas: 1 diff --git a/tests/templates/kuttl/resources/30-install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/resources/30-install-airflow-cluster.yaml.j2 index c92cf2a8..c367089c 100644 --- a/tests/templates/kuttl/resources/30-install-airflow-cluster.yaml.j2 +++ b/tests/templates/kuttl/resources/30-install-airflow-cluster.yaml.j2 @@ -40,6 +40,7 @@ spec: credentialsSecret: test-airflow-credentials webservers: config: + listenerClass: external-unstable logging: enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }} roleGroups: diff --git a/tests/templates/kuttl/smoke/40-install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/smoke/40-install-airflow-cluster.yaml.j2 index b1cb7d07..03b2e66b 100644 --- a/tests/templates/kuttl/smoke/40-install-airflow-cluster.yaml.j2 +++ b/tests/templates/kuttl/smoke/40-install-airflow-cluster.yaml.j2 @@ -43,6 +43,7 @@ spec: credentialsSecret: test-airflow-credentials webservers: config: + listenerClass: external-unstable logging: enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }} configOverrides: