You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by ka...@apache.org on 2020/11/12 21:11:03 UTC

[airflow] 08/08: Better file extension for Helm template (#11702)

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

kaxilnaik pushed a commit to branch v1-10-test
in repository https://gitbox.apache.org/repos/asf/airflow.git

commit 91a130598f01ec5ab830bd1868391bbb90fa7712
Author: Kamil BreguĊ‚a <mi...@users.noreply.github.com>
AuthorDate: Wed Oct 21 12:17:19 2020 +0200

    Better file extension for Helm template (#11702)
    
    * Better file extension for Helm template
    
    * fixup! Better file extension for Helm template
    
    (cherry picked from commit ffc9aebeb265b7b2f71855e539b20895df2f4ca3)
---
 .../{pod-template-file.yaml => pod-template-file.kubernetes-helm-yaml}  | 0
 chart/templates/configmap.yaml                                          | 2 +-
 scripts/ci/kubernetes/ci_run_helm_testing.sh                            | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/chart/files/pod-template-file.yaml b/chart/files/pod-template-file.kubernetes-helm-yaml
similarity index 100%
rename from chart/files/pod-template-file.yaml
rename to chart/files/pod-template-file.kubernetes-helm-yaml
diff --git a/chart/templates/configmap.yaml b/chart/templates/configmap.yaml
index cc9a388..d5b4b08 100644
--- a/chart/templates/configmap.yaml
+++ b/chart/templates/configmap.yaml
@@ -60,6 +60,6 @@ data:
 {{- if .Values.podTemplate }}
     {{ .Values.podTemplate | nindent 4 }}
 {{- else }}
-{{ tpl (.Files.Get "files/pod-template-file.yaml") . | nindent 4 }}
+{{ tpl (.Files.Get "files/pod-template-file.kubernetes-helm-yaml") . | nindent 4 }}
 {{- end }}
 {{- end }}
diff --git a/scripts/ci/kubernetes/ci_run_helm_testing.sh b/scripts/ci/kubernetes/ci_run_helm_testing.sh
index 224cc9e..93d8337 100755
--- a/scripts/ci/kubernetes/ci_run_helm_testing.sh
+++ b/scripts/ci/kubernetes/ci_run_helm_testing.sh
@@ -20,7 +20,7 @@ echo "Running helm tests"
 
 chart_directory="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../../../chart/"
 
-cat chart/files/pod-template-file.yaml > chart/templates/pod-template-file.yaml
+cat chart/files/pod-template-file.kubernetes-helm-yaml > chart/templates/pod-template-file.yaml
 
 docker run -w /airflow-chart -v "$chart_directory":/airflow-chart \
   --entrypoint /bin/sh \