This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch v1-10-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/v1-10-test by this push:
new 77eb95d Fixes celery deployments for Airflow 2.0 (#11129)
77eb95d is described below
commit 77eb95d429e183b412189ced0f95a6e7e10393b9
Author: Jarek Potiuk <[email protected]>
AuthorDate: Fri Sep 25 12:31:28 2020 +0200
Fixes celery deployments for Airflow 2.0 (#11129)
The celery flower and worker commands have changed in Airflow 2.0.
The Helm Chart supported only 1.10 version of those commands and
this PR fixes it by adding both variants of them.
(cherry picked from commit b40df1bf12cc5a7dd4c05f3a201d05071c4e7c8c)
---
chart/templates/flower/flower-deployment.yaml | 2 +-
chart/templates/workers/worker-deployment.yaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/chart/templates/flower/flower-deployment.yaml
b/chart/templates/flower/flower-deployment.yaml
index 81325d0..145c80b 100644
--- a/chart/templates/flower/flower-deployment.yaml
+++ b/chart/templates/flower/flower-deployment.yaml
@@ -68,7 +68,7 @@ spec:
- name: flower
image: {{ template "flower_image" . }}
imagePullPolicy: {{ .Values.images.flower.pullPolicy }}
- args: ["flower"]
+ args: ["bash", "-c", "airflow flower || airflow celery flower"]
resources:
{{ toYaml .Values.flower.resources | indent 12 }}
volumeMounts:
diff --git a/chart/templates/workers/worker-deployment.yaml
b/chart/templates/workers/worker-deployment.yaml
index 439843d..23d2255 100644
--- a/chart/templates/workers/worker-deployment.yaml
+++ b/chart/templates/workers/worker-deployment.yaml
@@ -111,7 +111,7 @@ spec:
- name: worker
image: {{ template "airflow_image" . }}
imagePullPolicy: {{ .Values.images.airflow.pullPolicy }}
- args: ["worker"]
+ args: ["bash", "-c", "airflow worker || airflow celery worker"]
resources:
{{ toYaml .Values.workers.resources | indent 12 }}
ports:
