From 49ff84aff1ef3980bc11c39404e3cb3c268ddd18 Mon Sep 17 00:00:00 2001
From: Massimo Gaggero <massimo.gaggero@crs4.it>
Date: Tue, 12 Feb 2019 16:42:27 +0100
Subject: [PATCH] Implements #11353 : [stable/airflow] install-requirements.sh
 script should be always available

---
 stable/airflow/templates/deployments-scheduler.yaml | 4 ++--
 stable/airflow/templates/deployments-web.yaml       | 4 ++--
 stable/airflow/templates/statefulsets-workers.yaml  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/stable/airflow/templates/deployments-scheduler.yaml b/stable/airflow/templates/deployments-scheduler.yaml
index 129a6021bfc7..76f8a6c3b9be 100755
--- a/stable/airflow/templates/deployments-scheduler.yaml
+++ b/stable/airflow/templates/deployments-scheduler.yaml
@@ -69,14 +69,14 @@ spec:
           env:
           {{- include "airflow.mapenvsecrets" . | indent 10 }}
           volumeMounts:
+            - name: scripts
+              mountPath: /usr/local/scripts
           {{- if .Values.persistence.enabled }}
             - name: dags-data
               mountPath: {{ .Values.dags.path }}
           {{- else if .Values.dags.initContainer.enabled }}
             - name: dags-data
               mountPath: {{ .Values.dags.path }}
-            - name: scripts
-              mountPath: /usr/local/scripts
             {{- if .Values.airflow.connections }}
             - name: connections
               mountPath: /usr/local/connections
diff --git a/stable/airflow/templates/deployments-web.yaml b/stable/airflow/templates/deployments-web.yaml
index b09c28c5bc93..035428b320b2 100644
--- a/stable/airflow/templates/deployments-web.yaml
+++ b/stable/airflow/templates/deployments-web.yaml
@@ -72,14 +72,14 @@ spec:
           env:
             {{- include "airflow.mapenvsecrets" . | indent 10 }}
           volumeMounts:
+            - name: scripts
+              mountPath: /usr/local/scripts
           {{- if .Values.persistence.enabled }}
             - name: dags-data
               mountPath: {{ .Values.dags.path }}
           {{- else if .Values.dags.initContainer.enabled }}
             - name: dags-data
               mountPath: {{ .Values.dags.path }}
-            - name: scripts
-              mountPath: /usr/local/scripts
           {{- end }}
           {{- if .Values.logsPersistence.enabled }}
             - name: logs-data
diff --git a/stable/airflow/templates/statefulsets-workers.yaml b/stable/airflow/templates/statefulsets-workers.yaml
index 222d1008c403..f25ffa588d5f 100644
--- a/stable/airflow/templates/statefulsets-workers.yaml
+++ b/stable/airflow/templates/statefulsets-workers.yaml
@@ -77,6 +77,8 @@ spec:
           env:
           {{- include "airflow.mapenvsecrets" . | indent 10 }}
           volumeMounts:
+            - name: scripts
+              mountPath: /usr/local/scripts
           {{- $secretsDir := .Values.workers.secretsDir -}}
           {{- range .Values.workers.secrets }}
             - name: {{ . }}-volume
@@ -90,8 +92,6 @@ spec:
           {{- else if .Values.dags.initContainer.enabled }}
             - name: dags-data
               mountPath: {{ .Values.dags.path }}
-            - name: scripts
-              mountPath: /usr/local/scripts
           {{- end }}
           args:
             - "bash"