Skip to content

Commit 68114d0

Browse files
cognifloydcognifloyd
committed
minor quoting fix for MacVim highlighting
1 parent 31e0171 commit 68114d0

File tree

5 files changed

+25
-25
lines changed

5 files changed

+25
-25
lines changed

‎templates/_helpers.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ Create the name of the stackstorm-ha service account to use
137137
{{- end }}
138138
# System packs
139139
- name: st2-system-packs
140-
image: "{{ template "imageRepository" . }}/st2actionrunner:{{ .Chart.AppVersion }}"
140+
image: '{{ template "imageRepository" . }}/st2actionrunner:{{ .Chart.AppVersion }}'
141141
imagePullPolicy: {{ .Values.image.pullPolicy }}
142142
volumeMounts:
143143
- name: st2-packs-vol

‎templates/deployments.yaml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ spec:
4545
{{ include "init-containers-wait-for-mq" . | indent 6 }}
4646
# Sidecar container for generating .htpasswd with st2 username & password pair and sharing produced file with the main st2auth container
4747
- name: generate-htpasswd
48-
image: "{{ template "imageRepository" . }}/st2auth:{{ .Chart.AppVersion }}"
48+
image: '{{ template "imageRepository" . }}/st2auth:{{ .Chart.AppVersion }}'
4949
imagePullPolicy: {{ .Values.image.pullPolicy }}
5050
env:
5151
- name: ST2_AUTH_USERNAME
@@ -67,7 +67,7 @@ spec:
6767
- printf "${ST2_AUTH_USERNAME}:$(openssl passwd -apr1 "${ST2_AUTH_PASSWORD}")\n" > /tmp/st2/htpasswd
6868
containers:
6969
- name: st2auth
70-
image: "{{ template "imageRepository" . }}/st2auth:{{ .Chart.AppVersion }}"
70+
image: '{{ template "imageRepository" . }}/st2auth:{{ .Chart.AppVersion }}'
7171
imagePullPolicy: {{ .Values.image.pullPolicy }}
7272
ports:
7373
- containerPort: 9100
@@ -161,7 +161,7 @@ spec:
161161
{{- end }}
162162
containers:
163163
- name: st2api
164-
image: "{{ template "imageRepository" . }}/st2api:{{ .Chart.AppVersion }}"
164+
image: '{{ template "imageRepository" . }}/st2api:{{ .Chart.AppVersion }}'
165165
imagePullPolicy: {{ .Values.image.pullPolicy }}
166166
ports:
167167
- containerPort: 9101
@@ -265,7 +265,7 @@ spec:
265265
{{ include "init-containers-wait-for-mq" . | indent 6 }}
266266
containers:
267267
- name: st2stream
268-
image: "{{ template "imageRepository" . }}/st2stream:{{ .Chart.AppVersion }}"
268+
image: '{{ template "imageRepository" . }}/st2stream:{{ .Chart.AppVersion }}'
269269
imagePullPolicy: {{ .Values.image.pullPolicy }}
270270
ports:
271271
- containerPort: 9102
@@ -340,7 +340,7 @@ spec:
340340
{{- end }}
341341
containers:
342342
- name: st2web
343-
image: "{{ template "imageRepository" . }}/st2web:{{ .Chart.AppVersion }}"
343+
image: '{{ template "imageRepository" . }}/st2web:{{ .Chart.AppVersion }}'
344344
imagePullPolicy: {{ .Values.image.pullPolicy }}
345345
ports:
346346
- containerPort: 80
@@ -441,7 +441,7 @@ spec:
441441
{{ include "init-containers-wait-for-mq" . | indent 6 }}
442442
containers:
443443
- name: st2rulesengine
444-
image: "{{ template "imageRepository" . }}/st2rulesengine:{{ .Chart.AppVersion }}"
444+
image: '{{ template "imageRepository" . }}/st2rulesengine:{{ .Chart.AppVersion }}'
445445
imagePullPolicy: {{ .Values.image.pullPolicy }}
446446
# TODO: Add liveness/readiness probes (#3)
447447
#livenessProbe:
@@ -528,7 +528,7 @@ spec:
528528
{{ include "init-containers-wait-for-mq" . | indent 6 }}
529529
containers:
530530
- name: st2timersengine
531-
image: "{{ template "imageRepository" . }}/st2timersengine:{{ .Chart.AppVersion }}"
531+
image: '{{ template "imageRepository" . }}/st2timersengine:{{ .Chart.AppVersion }}'
532532
imagePullPolicy: {{ .Values.image.pullPolicy }}
533533
# TODO: Add liveness/readiness probes (#3)
534534
#livenessProbe:
@@ -607,7 +607,7 @@ spec:
607607
{{ include "init-containers-wait-for-mq" . | indent 6 }}
608608
containers:
609609
- name: st2workflowengine
610-
image: "{{ template "imageRepository" . }}/st2workflowengine:{{ .Chart.AppVersion }}"
610+
image: '{{ template "imageRepository" . }}/st2workflowengine:{{ .Chart.AppVersion }}'
611611
imagePullPolicy: {{ .Values.image.pullPolicy }}
612612
# TODO: Add liveness/readiness probes (#3)
613613
#livenessProbe:
@@ -698,7 +698,7 @@ spec:
698698
{{ include "init-containers-wait-for-mq" . | indent 6 }}
699699
containers:
700700
- name: st2scheduler
701-
image: "{{ template "imageRepository" . }}/st2scheduler:{{ .Chart.AppVersion }}"
701+
image: '{{ template "imageRepository" . }}/st2scheduler:{{ .Chart.AppVersion }}'
702702
imagePullPolicy: {{ .Values.image.pullPolicy }}
703703
# TODO: Add liveness/readiness probes (#3)
704704
#livenessProbe:
@@ -789,7 +789,7 @@ spec:
789789
{{ include "init-containers-wait-for-mq" . | indent 6 }}
790790
containers:
791791
- name: st2notifier
792-
image: "{{ template "imageRepository" . }}/st2notifier:{{ .Chart.AppVersion }}"
792+
image: '{{ template "imageRepository" . }}/st2notifier:{{ .Chart.AppVersion }}'
793793
imagePullPolicy: {{ .Values.image.pullPolicy }}
794794
# TODO: Add liveness/readiness probes (#3)
795795
#livenessProbe:
@@ -881,7 +881,7 @@ spec:
881881
{{- end }}
882882
containers:
883883
- name: st2sensorcontainer{{ template "hyphenPrefix" .name }}
884-
image: "{{ template "imageRepository" $ }}/st2sensorcontainer:{{ $.Chart.AppVersion }}"
884+
image: '{{ template "imageRepository" $ }}/st2sensorcontainer:{{ $.Chart.AppVersion }}'
885885
imagePullPolicy: {{ $.Values.image.pullPolicy }}
886886
{{- with .readinessProbe }}
887887
# Probe to check if app is running. Failure will lead to a pod restart.
@@ -1015,7 +1015,7 @@ spec:
10151015
{{- end }}
10161016
containers:
10171017
- name: st2actionrunner
1018-
image: "{{ template "imageRepository" . }}/st2actionrunner:{{ .Chart.AppVersion }}"
1018+
image: '{{ template "imageRepository" . }}/st2actionrunner:{{ .Chart.AppVersion }}'
10191019
imagePullPolicy: {{ .Values.image.pullPolicy }}
10201020
# TODO: Add liveness/readiness probes (#3)
10211021
#livenessProbe:
@@ -1128,7 +1128,7 @@ spec:
11281128
{{ include "init-containers-wait-for-mq" . | indent 6 }}
11291129
containers:
11301130
- name: st2garbagecollector
1131-
image: "{{ template "imageRepository" . }}/st2garbagecollector:{{ .Chart.AppVersion }}"
1131+
image: '{{ template "imageRepository" . }}/st2garbagecollector:{{ .Chart.AppVersion }}'
11321132
imagePullPolicy: {{ .Values.image.pullPolicy }}
11331133
# TODO: Add liveness/readiness probes (#3)
11341134
#livenessProbe:
@@ -1213,7 +1213,7 @@ spec:
12131213
{{- end }}
12141214
# Sidecar container for generating st2client config with st2 username & password pair and sharing produced file with the main container
12151215
- name: generate-st2client-config
1216-
image: "{{ template "imageRepository" . }}/st2actionrunner:{{ .Chart.AppVersion }}"
1216+
image: '{{ template "imageRepository" . }}/st2actionrunner:{{ .Chart.AppVersion }}'
12171217
imagePullPolicy: {{ .Values.image.pullPolicy }}
12181218
envFrom:
12191219
- configMapRef:
@@ -1244,7 +1244,7 @@ spec:
12441244
EOT
12451245
containers:
12461246
- name: st2client
1247-
image: "{{ template "imageRepository" . }}/st2actionrunner:{{ .Chart.AppVersion }}"
1247+
image: '{{ template "imageRepository" . }}/st2actionrunner:{{ .Chart.AppVersion }}'
12481248
imagePullPolicy: {{ .Values.image.pullPolicy }}
12491249
env:
12501250
- name: ST2CLIENT
@@ -1374,7 +1374,7 @@ spec:
13741374
{{- end }}
13751375
containers:
13761376
- name: st2chatops
1377-
image: "{{ .Values.st2chatops.image.repository | default "stackstorm" }}/{{ .Values.st2chatops.image.name | default "st2chatops" }}:{{ tpl (.Values.st2chatops.image.tag | default .Chart.AppVersion) . }}"
1377+
image: '{{ .Values.st2chatops.image.repository | default "stackstorm" }}/{{ .Values.st2chatops.image.name | default "st2chatops" }}:{{ tpl (.Values.st2chatops.image.tag | default .Chart.AppVersion) . }}'
13781378
imagePullPolicy: {{ .Values.st2chatops.image.pullPolicy | default .Values.image.pullPolicy }}
13791379
env:
13801380
- name: ST2_AUTH_USERNAME

‎templates/jobs.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ spec:
3838
{{- end }}
3939
containers:
4040
- name: st2-apply-rbac-definitions
41-
image: "{{ template "imageRepository" . }}/st2actionrunner:{{ .Chart.AppVersion }}"
41+
image: '{{ template "imageRepository" . }}/st2actionrunner:{{ .Chart.AppVersion }}'
4242
imagePullPolicy: {{ .Values.image.pullPolicy }}
4343
command:
4444
- st2-apply-rbac-definitions
@@ -126,7 +126,7 @@ spec:
126126
done
127127
# Sidecar container for generating st2client config with st2 username & password pair and sharing produced file with the main container
128128
- name: generate-st2client-config
129-
image: "{{ template "imageRepository" . }}/st2actionrunner:{{ .Chart.AppVersion }}"
129+
image: '{{ template "imageRepository" . }}/st2actionrunner:{{ .Chart.AppVersion }}'
130130
imagePullPolicy: {{ .Values.image.pullPolicy }}
131131
envFrom:
132132
- configMapRef:
@@ -157,7 +157,7 @@ spec:
157157
EOT
158158
containers:
159159
- name: st2-apikey-load
160-
image: "{{ template "imageRepository" . }}/st2actionrunner:{{ .Chart.AppVersion }}"
160+
image: '{{ template "imageRepository" . }}/st2actionrunner:{{ .Chart.AppVersion }}'
161161
imagePullPolicy: {{ .Values.image.pullPolicy }}
162162
command:
163163
- st2
@@ -224,7 +224,7 @@ spec:
224224
{{ include "init-containers-wait-for-db" . | indent 6 }}
225225
# Sidecar container for generating st2client config with st2 username & password pair and sharing produced file with the main container
226226
- name: generate-st2client-config
227-
image: "{{ template "imageRepository" . }}/st2actionrunner:{{ .Chart.AppVersion }}"
227+
image: '{{ template "imageRepository" . }}/st2actionrunner:{{ .Chart.AppVersion }}'
228228
imagePullPolicy: {{ .Values.image.pullPolicy }}
229229
envFrom:
230230
- configMapRef:
@@ -255,7 +255,7 @@ spec:
255255
EOT
256256
containers:
257257
- name: st2-key-load
258-
image: "{{ template "imageRepository" . }}/st2actionrunner:{{ .Chart.AppVersion }}"
258+
image: '{{ template "imageRepository" . }}/st2actionrunner:{{ .Chart.AppVersion }}'
259259
imagePullPolicy: {{ .Values.image.pullPolicy }}
260260
command:
261261
- st2
@@ -337,7 +337,7 @@ spec:
337337
{{ end }}
338338
containers:
339339
- name: st2-register-content
340-
image: "{{ template "imageRepository" . }}/st2actionrunner:{{ .Chart.AppVersion }}"
340+
image: '{{ template "imageRepository" . }}/st2actionrunner:{{ .Chart.AppVersion }}'
341341
imagePullPolicy: {{ .Values.image.pullPolicy }}
342342
command:
343343
- st2-register-content

‎templates/service-account.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ metadata:
1010
{{- end }}
1111
labels:
1212
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
13-
app: "{{ template "stackstorm-ha.name" . }}"
13+
app: '{{ template "stackstorm-ha.name" . }}'
1414
heritage: "{{ .Release.Service }}"
1515
release: "{{ .Release.Name }}"
1616
{{- end }}

‎templates/tests/st2tests-pod.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
# Run the actual BATS tests
2929
containers:
3030
- name: st2tests
31-
image: "{{ template "imageRepository" . }}/st2actionrunner:{{ .Chart.AppVersion }}"
31+
image: '{{ template "imageRepository" . }}/st2actionrunner:{{ .Chart.AppVersion }}'
3232
imagePullPolicy: {{ .Values.image.pullPolicy }}
3333
envFrom:
3434
- configMapRef:

0 commit comments

Comments
 (0)