Skip to content

Commit

Permalink
Better file extension for Helm template (#11702)
Browse files Browse the repository at this point in the history
* Better file extension for Helm template

* fixup! Better file extension for Helm template

(cherry picked from commit ffc9aeb)
  • Loading branch information
mik-laj authored and potiuk committed Nov 16, 2020
1 parent 7b015b0 commit d986a75
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion chart/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
2 changes: 1 addition & 1 deletion scripts/ci/kubernetes/ci_run_helm_testing.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit d986a75

Please sign in to comment.