Skip to content

Commit 999f810

Browse files
committed
Syntax Fixes.
1 parent 8523782 commit 999f810

5 files changed

Lines changed: 11 additions & 11 deletions

File tree

templates/postgres-deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
{{- include "puppetserver.postgres.labels" . | nindent 8 }}
1717
{{- if .Values.podAnnotations }}
1818
annotations:
19-
{{ toYaml .Values.podAnnotations | nindent 8 }}
19+
{{- toYaml .Values.podAnnotations | nindent 8 }}
2020
{{- end }}
2121
spec:
2222
hostname: postgres
@@ -25,7 +25,7 @@ spec:
2525
image: "{{.Values.postgres.image}}:{{.Values.postgres.tag}}"
2626
imagePullPolicy: "{{.Values.postgres.pullPolicy}}"
2727
resources:
28-
{{ toYaml .Values.puppetserver.resources | nindent 12 }}
28+
{{- toYaml .Values.postgres.resources | nindent 12 }}
2929
env:
3030
{{- range $key, $value := .Values.postgres.extraEnv }}
3131
- name: {{ $key }}

templates/puppetboard-deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ spec:
1717
{{- include "puppetserver.puppetboard.labels" . | nindent 8 }}
1818
{{- if .Values.podAnnotations }}
1919
annotations:
20-
{{ toYaml .Values.podAnnotations | nindent 8 }}
20+
{{- toYaml .Values.podAnnotations | nindent 8 }}
2121
{{- end }}
2222
spec:
2323
hostname: puppetboard
@@ -26,7 +26,7 @@ spec:
2626
image: "{{.Values.puppetboard.image}}:{{.Values.puppetboard.tag}}"
2727
imagePullPolicy: "{{.Values.puppetboard.pullPolicy}}"
2828
resources:
29-
{{ toYaml .Values.puppetserver.resources | nindent 12 }}
29+
{{- toYaml .Values.puppetboard.resources | nindent 12 }}
3030
ports:
3131
env:
3232
{{- range $key, $value := .Values.puppetboard.extraEnv }}

templates/puppetdb-deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
{{- include "puppetserver.puppetdb.labels" . | nindent 8 }}
1717
{{- if .Values.podAnnotations }}
1818
annotations:
19-
{{ toYaml .Values.podAnnotations | nindent 8 }}
19+
{{- toYaml .Values.podAnnotations | nindent 8 }}
2020
{{- end }}
2121
spec:
2222
hostname: puppetdb
@@ -25,7 +25,7 @@ spec:
2525
image: "{{.Values.puppetdb.image}}:{{.Values.puppetdb.tag}}"
2626
imagePullPolicy: "{{.Values.puppetdb.pullPolicy}}"
2727
resources:
28-
{{ toYaml .Values.puppetserver.resources | nindent 12 }}
28+
{{- toYaml .Values.puppetdb.resources | nindent 12 }}
2929
env:
3030
{{- range $key, $value := .Values.puppetdb.extraEnv }}
3131
- name: {{ $key }}

templates/puppetserver-deployment.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ spec:
1717
annotations:
1818
checksum/config: {{ include (print $.Template.BasePath "/hiera-configmap.yaml") . | sha256sum }}
1919
{{- if .Values.podAnnotations }}
20-
{{ toYaml .Values.podAnnotations | nindent 8 }}
20+
{{- toYaml .Values.podAnnotations | nindent 8 }}
2121
{{- end }}
2222
spec:
2323
hostname: {{ template "puppetserver.puppetserver.serviceName" . }}
@@ -26,7 +26,7 @@ spec:
2626
image: "{{.Values.puppetserver.image}}:{{.Values.puppetserver.tag}}"
2727
imagePullPolicy: "{{.Values.puppetserver.pullPolicy}}"
2828
resources:
29-
{{ toYaml .Values.puppetserver.resources | nindent 12 }}
29+
{{- toYaml .Values.puppetserver.resources | nindent 12 }}
3030
command: [ "sh", "-c" ]
3131
args:
3232
- mkdir -p /etc/puppetlabs/code/environments;
@@ -79,7 +79,7 @@ spec:
7979
image: "{{.Values.puppetserver.image}}:{{.Values.puppetserver.tag}}"
8080
imagePullPolicy: "{{.Values.puppetserver.pullPolicy}}"
8181
resources:
82-
{{ toYaml .Values.puppetserver.resources | nindent 12 }}
82+
{{- toYaml .Values.puppetserver.resources | nindent 12 }}
8383
env:
8484
{{- range $key, $value := .Values.puppetserver.extraEnv }}
8585
- name: {{ $key }}

templates/r10k-cronjob.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ spec:
1818
{{- include "puppetserver.r10k.labels" . | nindent 12 }}
1919
{{- if .Values.podAnnotations }}
2020
annotations:
21-
{{ toYaml .Values.podAnnotations | nindent 12 }}
21+
{{- toYaml .Values.podAnnotations | nindent 12 }}
2222
{{- end }}
2323
spec:
2424
containers:
2525
- name: r10k
2626
image: "{{.Values.r10k.image}}:{{.Values.r10k.tag}}"
2727
imagePullPolicy: "{{.Values.r10k.pullPolicy}}"
2828
resources:
29-
{{ toYaml .Values.r10k.resources | nindent 16 }}
29+
{{- toYaml .Values.r10k.resources | nindent 16 }}
3030
env:
3131
{{- range $key, $value := .Values.r10k.extraEnv }}
3232
- name: {{ $key }}

0 commit comments

Comments
 (0)