This is an automated email from the ASF dual-hosted git repository.
dimberman pushed a commit to branch v1-10-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/v1-10-test by this push:
new fd80a58 fix kubernetes 2.7 tests
fd80a58 is described below
commit fd80a588f409dbda0a1d48ab2e415cade7cb46db
Author: Daniel Imberman <[email protected]>
AuthorDate: Thu Sep 17 10:41:12 2020 -0700
fix kubernetes 2.7 tests
---
chart/templates/configmap.yaml | 2 +-
chart/values.yaml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/chart/templates/configmap.yaml b/chart/templates/configmap.yaml
index b24e474..f0e09a0 100644
--- a/chart/templates/configmap.yaml
+++ b/chart/templates/configmap.yaml
@@ -47,8 +47,8 @@ data:
{{- .Values.webserver.webserverConfig | nindent 4 }}
{{- end }}
-{{- if .Values.scheduler.airflowLocalSettings }}
airflow_local_settings.py: |
+{{- if .Values.scheduler.airflowLocalSettings }}
{{ .Values.scheduler.airflowLocalSettings | nindent 4 }}
{{- end }}
{{- if and .Values.dags.gitSync.enabled .Values.dags.gitSync.knownHosts }}
diff --git a/chart/values.yaml b/chart/values.yaml
index 066cd02..5c2ee4d 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -493,6 +493,7 @@ config:
image_pull_secrets: '{{ template "registry_secret" . }}'
dags_in_image: '{{ ternary "False" "True" (or .Values.dags.gitSync.enabled
.Values.dags.persistence.enabled) }}'
delete_worker_pods: 'True'
+ delete_worker_pods_on_failure: 'False'
run_as_user: '{{ .Values.uid }}'
fs_group: '{{ .Values.gid }}'
git_dags_folder_mount_point: '{{- if or .Values.dags.gitSync.enabled
.Values.dags.persistence.enabled }}{{ include "airflow_dags_mount_path" .
}}{{end}}'
