[stable/airflow] bug fix to make git sync work with branches other th…

…en master (#19414) * bug fix to make git sync work with branches other then master Signed-off-by: Hewitt, Mike <hmike1996@gmail.com> * remove not needed code Signed-off-by: Hewitt, Mike <hmike1996@gmail.com> * git sync will work without init now Signed-off-by: Hewitt, Mike <hmike1996@gmail.com> * git sync will work without init now Signed-off-by: Hewitt, Mike <hmike1996@gmail.com>
helm · Dec 6, 2019 · 301ad36 · 301ad36
1 parent 2d582dc
commit 301ad36
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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: 5.2.1
+version: 5.2.2
 appVersion: 1.10.4
 icon: https://airflow.apache.org/_images/pin_large.png
 home: https://airflow.apache.org/

diff --git a/stable/airflow/templates/configmap-git-clone.yaml b/stable/airflow/templates/configmap-git-clone.yaml
@@ -26,9 +26,7 @@ data:
     if [ -d "$DIR" ]; then
         rm -rf $( find $DIR -mindepth 1 )
     fi
-    git clone $REPO $DIR
-    cd $DIR
-    git reset --hard $REF
+    git clone $REPO -b $REF $DIR
   git-sync.sh: |
     #!/bin/sh -e
     REPO=$1
@@ -43,5 +41,8 @@ data:
     chmod 600 ~/.ssh/*
     echo -e "HOST $REPO_HOST\n  IdentityFile ~/.ssh/$PRIVATE_KEY" > ~/.ssh/config
     {{- end }}
+    {{- if eq .Values.dags.initContainer.enabled  false }}
+    git clone $REPO -b $REF $DIR
+    {{- end }}
     cd $DIR
     while true; do git pull; date; sleep $SYNC_TIME; done