Skip to content

Use toYaml for the environment variables #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use toYaml for the environment variables #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dca9f1f
Merge pull request #1 from jenkins-x-buildpacks/master
hervelemeur Mar 30, 2020
9b947b4
fix: use toYaml for the environment variables to be able to use value…
Mar 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions packs/C++/charts/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
{{- range $pkey, $pval := .Values.env }}
- name: {{ $pkey }}
value: {{ quote $pval }}
{{- end }}
{{ toYaml .Values.env | indent 10 }}
envFrom:
{{ toYaml .Values.envFrom | indent 10 }}
ports:
Expand Down
5 changes: 1 addition & 4 deletions packs/C++/charts/templates/ksvc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
{{- range $pkey, $pval := .Values.env }}
- name: {{ $pkey }}
value: {{ quote $pval }}
{{- end }}
{{ toYaml .Values.env | indent 14 }}
livenessProbe:
httpGet:
path: {{ .Values.probePath }}
Expand Down
5 changes: 1 addition & 4 deletions packs/D/charts/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
{{- range $pkey, $pval := .Values.env }}
- name: {{ $pkey }}
value: {{ quote $pval }}
{{- end }}
{{ toYaml .Values.env | indent 10 }}
envFrom:
{{ toYaml .Values.envFrom | indent 10 }}
ports:
Expand Down
5 changes: 1 addition & 4 deletions packs/D/charts/templates/ksvc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
{{- range $pkey, $pval := .Values.env }}
- name: {{ $pkey }}
value: {{ quote $pval }}
{{- end }}
{{ toYaml .Values.env | indent 14 }}
livenessProbe:
httpGet:
path: {{ .Values.probePath }}
Expand Down
5 changes: 1 addition & 4 deletions packs/appserver/charts/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
{{- range $pkey, $pval := .Values.env }}
- name: {{ $pkey }}
value: {{ quote $pval }}
{{- end }}
{{ toYaml .Values.env | indent 10 }}
envFrom:
{{ toYaml .Values.envFrom | indent 10 }}
ports:
Expand Down
5 changes: 1 addition & 4 deletions packs/appserver/charts/templates/ksvc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
{{- range $pkey, $pval := .Values.env }}
- name: {{ $pkey }}
value: {{ quote $pval }}
{{- end }}
{{ toYaml .Values.env | indent 14 }}
livenessProbe:
httpGet:
path: {{ .Values.probePath }}
Expand Down
5 changes: 1 addition & 4 deletions packs/csharp/charts/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
{{- range $pkey, $pval := .Values.env }}
- name: {{ $pkey }}
value: {{ quote $pval }}
{{- end }}
{{ toYaml .Values.env | indent 10 }}
envFrom:
{{ toYaml .Values.envFrom | indent 10 }}
ports:
Expand Down
5 changes: 1 addition & 4 deletions packs/csharp/charts/templates/ksvc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
{{- range $pkey, $pval := .Values.env }}
- name: {{ $pkey }}
value: {{ quote $pval }}
{{- end }}
{{ toYaml .Values.env | indent 14 }}
livenessProbe:
httpGet:
path: {{ .Values.probePath }}
Expand Down
5 changes: 1 addition & 4 deletions packs/cwp/charts/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
{{- range $pkey, $pval := .Values.env }}
- name: {{ $pkey }}
value: {{ quote $pval }}
{{- end }}
{{ toYaml .Values.env | indent 10 }}
envFrom:
{{ toYaml .Values.envFrom | indent 10 }}
ports:
Expand Down
5 changes: 1 addition & 4 deletions packs/cwp/charts/templates/ksvc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
{{- range $pkey, $pval := .Values.env }}
- name: {{ $pkey }}
value: {{ quote $pval }}
{{- end }}
{{ toYaml .Values.env | indent 14 }}
livenessProbe:
httpGet:
path: {{ .Values.probePath }}
Expand Down
5 changes: 1 addition & 4 deletions packs/dropwizard/charts/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
{{- range $pkey, $pval := .Values.env }}
- name: {{ $pkey }}
value: {{ quote $pval }}
{{- end }}
{{ toYaml .Values.env | indent 10 }}
envFrom:
{{ toYaml .Values.envFrom | indent 10 }}
ports:
Expand Down
5 changes: 1 addition & 4 deletions packs/dropwizard/charts/templates/ksvc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
{{- range $pkey, $pval := .Values.env }}
- name: {{ $pkey }}
value: {{ quote $pval }}
{{- end }}
{{ toYaml .Values.env | indent 14 }}
livenessProbe:
httpGet:
path: {{ .Values.probePath }}
Expand Down
5 changes: 1 addition & 4 deletions packs/go-mongodb/charts/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,7 @@ spec:
env:
- name: DB
value: {{ template "fullname" . }}-db
{{- range $pkey, $pval := .Values.env }}
- name: {{ $pkey }}
value: {{ quote $pval }}
{{- end }}
{{ toYaml .Values.env | indent 10 }}
envFrom:
{{ toYaml .Values.envFrom | indent 10 }}
ports:
Expand Down
5 changes: 1 addition & 4 deletions packs/go-mongodb/charts/templates/ksvc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
{{- range $pkey, $pval := .Values.env }}
- name: {{ $pkey }}
value: {{ quote $pval }}
{{- end }}
{{ toYaml .Values.env | indent 14 }}
livenessProbe:
httpGet:
path: {{ .Values.probePath }}
Expand Down
5 changes: 1 addition & 4 deletions packs/go/charts/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
{{- range $pkey, $pval := .Values.env }}
- name: {{ $pkey }}
value: {{ quote $pval }}
{{- end }}
{{ toYaml .Values.env | indent 10 }}
envFrom:
{{ toYaml .Values.envFrom | indent 10 }}
ports:
Expand Down
5 changes: 1 addition & 4 deletions packs/go/charts/templates/ksvc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
{{- range $pkey, $pval := .Values.env }}
- name: {{ $pkey }}
value: {{ quote $pval }}
{{- end }}
{{ toYaml .Values.env | indent 14 }}
livenessProbe:
httpGet:
path: {{ .Values.probePath }}
Expand Down
5 changes: 1 addition & 4 deletions packs/gradle/charts/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
{{- range $pkey, $pval := .Values.env }}
- name: {{ $pkey }}
value: {{ quote $pval }}
{{- end }}
{{ toYaml .Values.env | indent 10 }}
envFrom:
{{ toYaml .Values.envFrom | indent 10 }}
ports:
Expand Down
5 changes: 1 addition & 4 deletions packs/gradle/charts/templates/ksvc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
{{- range $pkey, $pval := .Values.env }}
- name: {{ $pkey }}
value: {{ quote $pval }}
{{- end }}
{{ toYaml .Values.env | indent 14 }}
livenessProbe:
httpGet:
path: {{ .Values.probePath }}
Expand Down
5 changes: 1 addition & 4 deletions packs/javascript/charts/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
{{- range $pkey, $pval := .Values.env }}
- name: {{ $pkey }}
value: {{ quote $pval }}
{{- end }}
{{ toYaml .Values.env | indent 10 }}
envFrom:
{{ toYaml .Values.envFrom | indent 10 }}
ports:
Expand Down
5 changes: 1 addition & 4 deletions packs/javascript/charts/templates/ksvc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
{{- range $pkey, $pval := .Values.env }}
- name: {{ $pkey }}
value: {{ quote $pval }}
{{- end }}
{{ toYaml .Values.env | indent 14 }}
livenessProbe:
httpGet:
path: {{ .Values.probePath }}
Expand Down
5 changes: 1 addition & 4 deletions packs/liberty/charts/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
{{- range $pkey, $pval := .Values.env }}
- name: {{ $pkey }}
value: {{ quote $pval }}
{{- end }}
{{ toYaml .Values.env | indent 10 }}
envFrom:
{{ toYaml .Values.envFrom | indent 10 }}
ports:
Expand Down
5 changes: 1 addition & 4 deletions packs/liberty/charts/templates/ksvc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
{{- range $pkey, $pval := .Values.env }}
- name: {{ $pkey }}
value: {{ quote $pval }}
{{- end }}
{{ toYaml .Values.env | indent 14 }}
livenessProbe:
httpGet:
path: {{ .Values.probePath }}
Expand Down
5 changes: 1 addition & 4 deletions packs/maven-java11/charts/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
{{- range $pkey, $pval := .Values.env }}
- name: {{ $pkey }}
value: {{ quote $pval }}
{{- end }}
{{ toYaml .Values.env | indent 10 }}
envFrom:
{{ toYaml .Values.envFrom | indent 10 }}
ports:
Expand Down
5 changes: 1 addition & 4 deletions packs/maven-java11/charts/templates/ksvc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
{{- range $pkey, $pval := .Values.env }}
- name: {{ $pkey }}
value: {{ quote $pval }}
{{- end }}
{{ toYaml .Values.env | indent 14 }}
livenessProbe:
httpGet:
path: {{ .Values.probePath }}
Expand Down
5 changes: 1 addition & 4 deletions packs/maven/charts/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
{{- range $pkey, $pval := .Values.env }}
- name: {{ $pkey }}
value: {{ quote $pval }}
{{- end }}
{{ toYaml .Values.env | indent 10 }}
envFrom:
{{ toYaml .Values.envFrom | indent 10 }}
ports:
Expand Down
5 changes: 1 addition & 4 deletions packs/maven/charts/templates/ksvc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
{{- range $pkey, $pval := .Values.env }}
- name: {{ $pkey }}
value: {{ quote $pval }}
{{- end }}
{{ toYaml .Values.env | indent 14 }}
livenessProbe:
httpGet:
path: {{ .Values.probePath }}
Expand Down
5 changes: 1 addition & 4 deletions packs/ml-python-gpu-service/charts/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
{{- range $pkey, $pval := .Values.env }}
- name: {{ $pkey }}
value: {{ quote $pval }}
{{- end }}
{{ toYaml .Values.env | indent 10 }}
envFrom:
{{ toYaml .Values.envFrom | indent 10 }}
ports:
Expand Down
5 changes: 1 addition & 4 deletions packs/ml-python-gpu-service/charts/templates/ksvc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
{{- range $pkey, $pval := .Values.env }}
- name: {{ $pkey }}
value: {{ quote $pval }}
{{- end }}
{{ toYaml .Values.env | indent 14 }}
livenessProbe:
httpGet:
path: {{ .Values.probePath }}
Expand Down
5 changes: 1 addition & 4 deletions packs/ml-python-gpu-training/charts/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@ spec:
env:
- name: TARGET_SERVICE_NAME
value: {{ .Chart.Name | replace "-training" "-service"}}
{{- range $pkey, $pval := .Values.env }}
- name: {{ $pkey }}
value: {{ quote $pval }}
{{- end }}
{{ toYaml .Values.env | indent 10 }}
envFrom:
{{ toYaml .Values.envFrom | indent 10 }}
ports:
Expand Down
5 changes: 1 addition & 4 deletions packs/ml-python-gpu-training/charts/templates/ksvc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
{{- range $pkey, $pval := .Values.env }}
- name: {{ $pkey }}
value: {{ quote $pval }}
{{- end }}
{{ toYaml .Values.env | indent 14 }}
livenessProbe:
httpGet:
path: {{ .Values.probePath }}
Expand Down
5 changes: 1 addition & 4 deletions packs/ml-python-service/charts/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
{{- range $pkey, $pval := .Values.env }}
- name: {{ $pkey }}
value: {{ quote $pval }}
{{- end }}
{{ toYaml .Values.env | indent 10 }}
envFrom:
{{ toYaml .Values.envFrom | indent 10 }}
ports:
Expand Down
5 changes: 1 addition & 4 deletions packs/ml-python-service/charts/templates/ksvc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,7 @@ spec:
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
env:
{{- range $pkey, $pval := .Values.env }}
- name: {{ $pkey }}
value: {{ quote $pval }}
{{- end }}
{{ toYaml .Values.env | indent 14 }}
livenessProbe:
httpGet:
path: {{ .Values.probePath }}
Expand Down
5 changes: 1 addition & 4 deletions packs/ml-python-training/charts/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@ spec:
env:
- name: TARGET_SERVICE_NAME
value: {{ .Chart.Name | replace "-training" "-service"}}
{{- range $pkey, $pval := .Values.env }}
- name: {{ $pkey }}
value: {{ quote $pval }}
{{- end }}
{{ toYaml .Values.env | indent 10 }}
envFrom:
{{ toYaml .Values.envFrom | indent 10 }}
ports:
Expand Down
Loading