Fix KEDA Autoscaler connectionFromEnv (apache#15561)

Jorricks · Apr 29, 2021 · 924af8d · 924af8d
1 parent 5045419
commit 924af8d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -59,7 +59,7 @@ def test_should_add_git_sync_container_to_worker_if_persistence_is_not_enabled_b
             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 @@ def test_should_not_add_sync_container_to_worker_if_git_sync_and_persistence_are
             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])