From c23914c8f182fd9b05f76dd338b584be8830ee31 Mon Sep 17 00:00:00 2001
From: memory <n@oden.io>
Date: Thu, 12 Mar 2020 12:00:39 -0400
Subject: [PATCH] stable/airflow: revert initdb order change (#21426)

The init order change in https://github.com/helm/charts/pull/21368
was the wrong solution to the problem at hand (circular dependencies
between a custom db hook and initdb) and can create init failures
when installing with a blank db.  Reverting.

Signed-off-by: Nathan J. Mehl <n@oden.io>
---
 stable/airflow/Chart.yaml                        |  2 +-
 .../airflow/templates/deployments-scheduler.yaml | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/stable/airflow/Chart.yaml b/stable/airflow/Chart.yaml
index a2c5b4cede..817678fc09 100644
--- a/stable/airflow/Chart.yaml
+++ b/stable/airflow/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Airflow is a platform to programmatically author, schedule and monitor workflows
 name: airflow
-version: 6.4.0
+version: 6.5.0
 appVersion: 1.10.4
 icon: https://airflow.apache.org/_images/pin_large.png
 home: https://airflow.apache.org/
diff --git a/stable/airflow/templates/deployments-scheduler.yaml b/stable/airflow/templates/deployments-scheduler.yaml
index 67e585f15d..cdaae2e544 100644
--- a/stable/airflow/templates/deployments-scheduler.yaml
+++ b/stable/airflow/templates/deployments-scheduler.yaml
@@ -195,6 +195,10 @@ spec:
               mkdir -p /usr/local/airflow/.local/bin &&
               export PATH=/usr/local/airflow/.local/bin:$PATH &&
               /usr/local/scripts/install-requirements.sh &&
+              {{- if .Values.airflow.initdb }}
+              echo "*** executing initdb" &&
+              airflow initdb &&
+              {{- end }}
               {{- if .Values.airflow.variables }}
                 echo "*** adding variables" &&
                 airflow variables -i /usr/local/variables-pools/variables.json &&
@@ -203,10 +207,6 @@ spec:
                 echo "*** adding connections" &&
                 /usr/local/connections/add-connections.sh &&
               {{- end }}
-              {{- if .Values.airflow.initdb }}
-              echo "*** executing initdb" &&
-              airflow initdb &&
-              {{- end }}
             {{- if .Values.airflow.pools }}
               echo "*** adding pools" &&
               airflow pool -i /usr/local/variables-pools/pools.json &&
@@ -219,6 +219,10 @@ spec:
               sleep 10 &&
               mkdir -p /usr/local/airflow/.local/bin &&
               export PATH=/usr/local/airflow/.local/bin:$PATH &&
+              {{- if .Values.airflow.initdb }}
+              echo "*** executing initdb" &&
+              airflow initdb &&
+              {{- end }}
               {{- if .Values.airflow.variables }}
                 echo "*** adding variables" &&
                 airflow variables -i /usr/local/variables-pools/variables.json &&
@@ -227,10 +231,6 @@ spec:
                 echo "*** adding connections" &&
                 /usr/local/connections/add-connections.sh &&
               {{- end }}
-              {{- if .Values.airflow.initdb }}
-              echo "*** executing initdb" &&
-              airflow initdb &&
-              {{- end }}
             {{- if .Values.airflow.pools }}
               echo "*** adding pools" &&
               airflow pool -i /usr/local/variables-pools/pools.json &&