[airflow] branch main updated: Chart: CeleryExecutor namespace depends on Airflow version (#32753)

[jedcunningham]

This is an automated email from the ASF dual-hosted git repository.

jedcunningham pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/main by this push:
     new f12b161a88 Chart: CeleryExecutor namespace depends on Airflow version 
(#32753)
f12b161a88 is described below

commit f12b161a882ddbc6b6fda950c4cc5cd277166819
Author: Mikaël Ducharme <mducha...@mozilla.com>
AuthorDate: Mon Jul 24 15:57:25 2023 -0400

    Chart: CeleryExecutor namespace depends on Airflow version (#32753)
---
 chart/templates/_helpers.yaml                  |  8 ++++++++
 chart/templates/workers/worker-deployment.yaml |  2 +-
 helm_tests/airflow_core/test_worker.py         | 18 ++++++++++++++++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/chart/templates/_helpers.yaml b/chart/templates/_helpers.yaml
index e0c158c765..742375f21e 100644
--- a/chart/templates/_helpers.yaml
+++ b/chart/templates/_helpers.yaml
@@ -371,6 +371,14 @@ If release name contains chart name it will be used as a 
full name.
   {{- printf "%s/%s" .Values.kerberos.ccacheMountPath 
.Values.kerberos.ccacheFileName }}
 {{- end }}
 
+{{- define "celery_executor_namespace" -}}
+  {{- if semverCompare ">=2.7.0" .Values.airflowVersion }}
+    {{- print "airflow.providers.celery.executors.celery_executor.app" -}}
+  {{- else }}
+    {{- print "airflow.executors.celery_executor.app" -}}
+  {{- end }}
+{{- end }}
+
 {{- define "pgbouncer_config" -}}
 {{ $resultBackendConnection := .Values.data.resultBackendConnection | default 
.Values.data.metadataConnection }}
 {{ $pgMetadataHost := .Values.data.metadataConnection.host | default (printf 
"%s-%s.%s" .Release.Name "postgresql" .Release.Namespace) }}
diff --git a/chart/templates/workers/worker-deployment.yaml 
b/chart/templates/workers/worker-deployment.yaml
index 4e306745d7..235f3f783f 100644
--- a/chart/templates/workers/worker-deployment.yaml
+++ b/chart/templates/workers/worker-deployment.yaml
@@ -205,7 +205,7 @@ spec:
                 {{- else }}
                 - sh
                 - -c
-                - CONNECTION_CHECK_MAX_COUNT=0 exec /entrypoint python -m 
celery --app airflow.providers.celery.executors.celery_executor.app inspect 
ping -d celery@$(hostname)
+                - CONNECTION_CHECK_MAX_COUNT=0 exec /entrypoint python -m 
celery --app {{ include "celery_executor_namespace" . }} inspect ping -d 
celery@$(hostname)
                 {{- end }}
           {{- end }}
           ports:
diff --git a/helm_tests/airflow_core/test_worker.py 
b/helm_tests/airflow_core/test_worker.py
index 20cc851ae9..22d5be1822 100644
--- a/helm_tests/airflow_core/test_worker.py
+++ b/helm_tests/airflow_core/test_worker.py
@@ -388,6 +388,24 @@ class TestWorker:
 
         assert jmespath.search("spec.template.spec.runtimeClassName", docs[0]) 
== "nvidia"
 
+    @pytest.mark.parametrize(
+        "airflow_version, default_cmd",
+        [
+            ("2.7.0", 
"airflow.providers.celery.executors.celery_executor.app"),
+            ("2.6.3", "airflow.executors.celery_executor.app"),
+        ],
+    )
+    def test_livenessprobe_default_command(self, airflow_version, default_cmd):
+        docs = render_chart(
+            values={"airflowVersion": airflow_version},
+            show_only=["templates/workers/worker-deployment.yaml"],
+        )
+
+        livenessprobe_cmd = jmespath.search(
+            "spec.template.spec.containers[0].livenessProbe.exec.command", 
docs[0]
+        )
+        assert default_cmd in livenessprobe_cmd[-1]
+
     def test_livenessprobe_values_are_configurable(self):
         docs = render_chart(
             values={