[airflow] branch master updated: Fix KEDA Autoscaler ``connectionFromEnv`` (#15561)

[kaxilnaik]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 924af8d  Fix KEDA Autoscaler ``connectionFromEnv`` (#15561)
924af8d is described below

commit 924af8d222120caf91ab239cffe69464ee12738c
Author: YuDorogov <34017639+yudoro...@users.noreply.github.com>
AuthorDate: Fri Apr 30 06:33:59 2021 +0700

    Fix KEDA Autoscaler ``connectionFromEnv`` (#15561)
---
 chart/templates/workers/worker-deployment.yaml | 6 +++---
 chart/tests/test_git_sync_worker.py            | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/chart/templates/workers/worker-deployment.yaml 
b/chart/templates/workers/worker-deployment.yaml
index f637888..24bd1a8 100644
--- a/chart/templates/workers/worker-deployment.yaml
+++ b/chart/templates/workers/worker-deployment.yaml
@@ -124,9 +124,6 @@ spec:
           {{- include "custom_airflow_environment" . | indent 10 }}
           {{- include "standard_airflow_environment" . | indent 10 }}
       containers:
-        {{- if and (.Values.dags.gitSync.enabled) (not 
.Values.dags.persistence.enabled) }}
-        {{- include "git_sync_container" . | indent 8 }}
-        {{- end }}
         - name: worker
           image: {{ template "airflow_image" . }}
           imagePullPolicy: {{ .Values.images.airflow.pullPolicy }}
@@ -176,6 +173,9 @@ spec:
             - name: KRB5CCNAME
               value:  {{ include "kerberos_ccache_path" . | quote }}
           {{- end }}
+        {{- if and (.Values.dags.gitSync.enabled) (not 
.Values.dags.persistence.enabled) }}
+        {{- include "git_sync_container" . | indent 8 }}
+        {{- end }}
 {{- if $persistence }}
         - name: worker-gc
           image: {{ template "airflow_image" . }}
diff --git a/chart/tests/test_git_sync_worker.py 
b/chart/tests/test_git_sync_worker.py
index c48d001..1ffd39e 100644
--- a/chart/tests/test_git_sync_worker.py
+++ b/chart/tests/test_git_sync_worker.py
@@ -59,7 +59,7 @@ class GitSyncWorkerTest(unittest.TestCase):
             show_only=["templates/workers/worker-deployment.yaml"],
         )
 
-        assert "git-sync" == 
jmespath.search("spec.template.spec.containers[0].name", docs[0])
+        assert "git-sync" == 
jmespath.search("spec.template.spec.containers[1].name", docs[0])
 
     def 
test_should_not_add_sync_container_to_worker_if_git_sync_and_persistence_are_enabled(self):
         docs = render_chart(
@@ -73,4 +73,4 @@ class GitSyncWorkerTest(unittest.TestCase):
             show_only=["templates/workers/worker-deployment.yaml"],
         )
 
-        assert "git-sync" != 
jmespath.search("spec.template.spec.containers[0].name", docs[0])
+        assert "git-sync" != 
jmespath.search("spec.template.spec.containers[1].name", docs[0])