Skip to content

Commit 283e34b

Browse files
W3D3W3D3
committed
🎨 style(chart): Reformat yaml files to always include whitespace in template strings
1 parent ce8a1c4 commit 283e34b

15 files changed

+218
-218
lines changed

‎chart/templates/ad-service.yaml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ limitations under the License.
1616
apiVersion: v1
1717
kind: Service
1818
metadata:
19-
name: unguard-{{.Values.adService.name}}
19+
name: unguard-{{ .Values.adService.name }}
2020
labels:
21-
app.kubernetes.io/name: {{.Values.adService.name}}
21+
app.kubernetes.io/name: {{ .Values.adService.name }}
2222
app.kubernetes.io/part-of: unguard
2323
{{ include "renderLabels" .Values.labels.common | indent 4 }}
2424
spec:
2525
type: {{ .Values.adService.service.type }}
2626
selector:
27-
app.kubernetes.io/name: {{.Values.adService.name}}
27+
app.kubernetes.io/name: {{ .Values.adService.name }}
2828
app.kubernetes.io/part-of: unguard
2929
ports:
3030
{{- .Values.adService.service.ports | toYaml | nindent 4 }}
@@ -33,31 +33,31 @@ spec:
3333
apiVersion: apps/v1
3434
kind: Deployment
3535
metadata:
36-
name: unguard-{{.Values.adService.name}}
36+
name: unguard-{{ .Values.adService.name }}
3737
labels:
38-
app.kubernetes.io/name: {{.Values.adService.name}}
38+
app.kubernetes.io/name: {{ .Values.adService.name }}
3939
app.kubernetes.io/part-of: unguard
4040
{{ include "renderLabels" .Values.labels.common }}
4141
spec:
4242
selector:
4343
matchLabels:
44-
app.kubernetes.io/name: {{.Values.adService.name}}
44+
app.kubernetes.io/name: {{ .Values.adService.name }}
4545
app.kubernetes.io/part-of: unguard
4646
strategy:
47-
type: {{.Values.adService.deployment.strategy.type}}
47+
type: {{ .Values.adService.deployment.strategy.type }}
4848
template:
4949
metadata:
5050
labels:
51-
app.kubernetes.io/name: {{.Values.adService.name}}
51+
app.kubernetes.io/name: {{ .Values.adService.name }}
5252
app.kubernetes.io/part-of: unguard
5353
{{ include "renderLabels" .Values.labels.common | indent 8 }}
5454
spec:
5555
containers:
56-
- name: {{.Values.adService.name}}
57-
image: {{.Values.adService.deployment.container.image.repository}}:{{.Values.adService.deployment.container.image.tag}}
58-
imagePullPolicy: {{.Values.adService.deployment.container.image.pullPolicy}}
56+
- name: {{ .Values.adService.name }}
57+
image: {{ .Values.adService.deployment.container.image.repository }}:{{ .Values.adService.deployment.container.image.tag }}
58+
imagePullPolicy: {{ .Values.adService.deployment.container.image.pullPolicy }}
5959
ports:
60-
- containerPort: {{.Values.adService.deployment.container.ports.containerPort}}
60+
- containerPort: {{ .Values.adService.deployment.container.ports.containerPort }}
6161
env:
6262
- name: ASPNETCORE_ENVIRONMENT
6363
value: {{ quote .Values.adService.deployment.container.env.ASPNETCORE_ENVIRONMENT }}
@@ -68,7 +68,7 @@ spec:
6868
- name: USER_AUTH_SERVICE_ADDRESS
6969
value: {{ quote .Values.adService.deployment.container.env.USER_AUTH_SERVICE_ADDRESS }}
7070
- name: JAEGER_SERVICE_NAME
71-
value: {{quote (printf "unguard-%s" .Values.adService.name) }}
71+
value: {{ quote (printf "unguard-%s" .Values.adService.name) }}
7272
- name: JAEGER_AGENT_HOST
7373
value: {{ quote (printf "%s-%s" .Values.jaeger.name .Values.adService.deployment.container.env.JAEGER_AGENT_HOST) }}
7474
- name: JAEGER_SAMPLER_TYPE

‎chart/templates/envoy-proxy.yaml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ limitations under the License.
1717
apiVersion: v1
1818
kind: Service
1919
metadata:
20-
name: unguard-{{.Values.envoyProxy.name}}
20+
name: unguard-{{ .Values.envoyProxy.name }}
2121
labels:
22-
app.kubernetes.io/name: {{.Values.envoyProxy.name}}
22+
app.kubernetes.io/name: {{ .Values.envoyProxy.name }}
2323
app.kubernetes.io/part-of: unguard
2424
{{ include "renderLabels" .Values.labels.common | indent 4 }}
2525
spec:
26-
{{if .Values.aws.enabled}}
26+
{{ if .Values.aws.enabled }}
2727
type: NodePort
28-
{{else}}
28+
{{ else }}
2929
type: {{ .Values.envoyProxy.service.type }}
30-
{{end}}
30+
{{ end }}
3131
selector:
32-
app.kubernetes.io/name: {{.Values.envoyProxy.name}}
32+
app.kubernetes.io/name: {{ .Values.envoyProxy.name }}
3333
app.kubernetes.io/part-of: unguard
3434
ports:
3535
{{- .Values.envoyProxy.service.ports | toYaml | nindent 4 }}
@@ -38,28 +38,28 @@ spec:
3838
apiVersion: apps/v1
3939
kind: Deployment
4040
metadata:
41-
name: unguard-{{.Values.envoyProxy.name}}
41+
name: unguard-{{ .Values.envoyProxy.name }}
4242
labels:
43-
app.kubernetes.io/name: {{.Values.envoyProxy.name}}
43+
app.kubernetes.io/name: {{ .Values.envoyProxy.name }}
4444
app.kubernetes.io/part-of: unguard
4545
{{ include "renderLabels" .Values.labels.common | indent 4 }}
4646
spec:
4747
selector:
4848
matchLabels:
49-
app.kubernetes.io/name: {{.Values.envoyProxy.name}}
49+
app.kubernetes.io/name: {{ .Values.envoyProxy.name }}
5050
app.kubernetes.io/part-of: unguard
5151
strategy:
52-
type: {{.Values.envoyProxy.deployment.strategy.type}}
52+
type: {{ .Values.envoyProxy.deployment.strategy.type }}
5353
template:
5454
metadata:
5555
labels:
56-
app.kubernetes.io/name: {{.Values.envoyProxy.name}}
56+
app.kubernetes.io/name: {{ .Values.envoyProxy.name }}
5757
app.kubernetes.io/part-of: unguard
5858
{{ include "renderLabels" .Values.labels.common | indent 8 }}
5959
spec:
6060
containers:
61-
- name: {{.Values.envoyProxy.name}}
62-
image: {{.Values.envoyProxy.deployment.container.image.repository}}:{{.Values.envoyProxy.deployment.container.image.tag}}
63-
imagePullPolicy: {{.Values.envoyProxy.deployment.container.image.pullPolicy}}
61+
- name: {{ .Values.envoyProxy.name }}
62+
image: {{ .Values.envoyProxy.deployment.container.image.repository }}:{{ .Values.envoyProxy.deployment.container.image.tag }}
63+
imagePullPolicy: {{ .Values.envoyProxy.deployment.container.image.pullPolicy }}
6464
ports:
6565
{{- .Values.envoyProxy.deployment.container.ports | toYaml | nindent 12 }}

‎chart/templates/frontend.yaml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ limitations under the License.
1717
apiVersion: v1
1818
kind: Service
1919
metadata:
20-
name: unguard-{{.Values.frontend.name}}
20+
name: unguard-{{ .Values.frontend.name }}
2121
labels:
22-
app.kubernetes.io/name: {{.Values.frontend.name}}
22+
app.kubernetes.io/name: {{ .Values.frontend.name }}
2323
app.kubernetes.io/part-of: unguard
2424
{{ include "renderLabels" .Values.labels.common | indent 4 }}
2525
spec:
2626
type: {{ .Values.frontend.service.type }}
2727
selector:
28-
app.kubernetes.io/name: {{.Values.frontend.name}}
28+
app.kubernetes.io/name: {{ .Values.frontend.name }}
2929
app.kubernetes.io/part-of: unguard
3030
ports:
3131
{{- .Values.frontend.service.ports | toYaml | nindent 4 }}
@@ -34,31 +34,31 @@ spec:
3434
apiVersion: apps/v1
3535
kind: Deployment
3636
metadata:
37-
name: unguard-{{.Values.frontend.name}}
37+
name: unguard-{{ .Values.frontend.name }}
3838
labels:
39-
app.kubernetes.io/name: {{.Values.frontend.name}}
39+
app.kubernetes.io/name: {{ .Values.frontend.name }}
4040
app.kubernetes.io/part-of: unguard
4141
{{ include "renderLabels" .Values.labels.common | indent 4 }}
4242
spec:
4343
selector:
4444
matchLabels:
45-
app.kubernetes.io/name: {{.Values.frontend.name}}
45+
app.kubernetes.io/name: {{ .Values.frontend.name }}
4646
app.kubernetes.io/part-of: unguard
4747
strategy:
48-
type: {{.Values.frontend.deployment.strategy.type}}
48+
type: {{ .Values.frontend.deployment.strategy.type }}
4949
template:
5050
metadata:
5151
labels:
52-
app.kubernetes.io/name: {{.Values.frontend.name}}
52+
app.kubernetes.io/name: {{ .Values.frontend.name }}
5353
app.kubernetes.io/part-of: unguard
5454
{{ include "renderLabels" .Values.labels.common | indent 8 }}
5555
spec:
5656
containers:
57-
- name: {{.Values.frontend.name}}
58-
image: {{.Values.frontend.deployment.container.image.repository}}:{{.Values.frontend.deployment.container.image.tag}}
59-
imagePullPolicy: {{.Values.frontend.deployment.container.image.pullPolicy}}
57+
- name: {{ .Values.frontend.name }}
58+
image: {{ .Values.frontend.deployment.container.image.repository }}:{{ .Values.frontend.deployment.container.image.tag }}
59+
imagePullPolicy: {{ .Values.frontend.deployment.container.image.pullPolicy }}
6060
ports:
61-
- containerPort: {{.Values.frontend.deployment.container.ports.containerPort}}
61+
- containerPort: {{ .Values.frontend.deployment.container.ports.containerPort }}
6262
env:
6363
- name: MICROBLOG_SERVICE_ADDRESS
6464
value: {{ quote .Values.frontend.deployment.container.env.MICROBLOG_SERVICE_ADDRESS }}
@@ -87,7 +87,7 @@ spec:
8787
- name: STATUS_SERVICE_BASE_PATH
8888
value: {{ quote .Values.frontend.deployment.container.env.STATUS_SERVICE_BASE_PATH }}
8989
- name: JAEGER_SERVICE_NAME
90-
value: {{quote (printf "unguard-%s" .Values.frontend.name) }}
90+
value: {{ quote (printf "unguard-%s" .Values.frontend.name) }}
9191
- name: JAEGER_AGENT_HOST
9292
value: {{ quote (printf "%s-%s" .Values.jaeger.name .Values.frontend.deployment.container.env.JAEGER_AGENT_HOST) }}
9393
- name: JAEGER_SAMPLER_TYPE

‎chart/templates/ingress.yaml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,26 @@ limitations under the License.
1717
apiVersion: networking.k8s.io/v1
1818
kind: Ingress
1919
metadata:
20-
name: unguard-{{.Values.ingress.name}}
20+
name: unguard-{{ .Values.ingress.name }}
2121
labels:
22-
app.kubernetes.io/name: {{.Values.ingress.name}}
22+
app.kubernetes.io/name: {{ .Values.ingress.name }}
2323
app.kubernetes.io/part-of: unguard
2424
{{ include "renderLabels" .Values.labels.common | indent 4 }}
25-
{{if .Values.aws.enabled}}
25+
{{ if .Values.aws.enabled }}
2626
annotations:
2727
{{- .Values.aws.ingress.annotations | toYaml | nindent 4 }}
28-
{{end}}
28+
{{ end }}
2929
spec:
3030
rules:
31-
{{if .Values.localDev.enabled}}
31+
{{ if .Values.localDev.enabled }}
3232
- host: unguard.kube
33-
{{end}}
34-
{{if .Values.localDev.enabled}}
33+
{{ end }}
34+
{{ if .Values.localDev.enabled }}
3535
http:
36-
{{end}}
37-
{{if .Values.aws.enabled}}
36+
{{ end }}
37+
{{ if .Values.aws.enabled }}
3838
- http:
39-
{{end}}
39+
{{ end }}
4040
paths:
4141
- path: /healthz
4242
pathType: Prefix
@@ -52,4 +52,4 @@ spec:
5252
name: unguard-envoy-proxy
5353
port:
5454
number: 8080
55-
{{end}}
55+
{{ end }}

‎chart/templates/like-service.yaml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ limitations under the License.
1616
apiVersion: v1
1717
kind: Service
1818
metadata:
19-
name: unguard-{{.Values.likeService.name}}
19+
name: unguard-{{ .Values.likeService.name }}
2020
labels:
21-
app.kubernetes.io/name: {{.Values.likeService.name}}
21+
app.kubernetes.io/name: {{ .Values.likeService.name }}
2222
app.kubernetes.io/part-of: unguard
2323
{{ include "renderLabels" .Values.labels.common | indent 4 }}
2424
spec:
2525
type: {{ .Values.likeService.service.type }}
2626
selector:
27-
app.kubernetes.io/name: {{.Values.likeService.name}}
27+
app.kubernetes.io/name: {{ .Values.likeService.name }}
2828
app.kubernetes.io/part-of: unguard
2929
ports:
3030
{{- .Values.likeService.service.ports | toYaml | nindent 4 }}
@@ -33,31 +33,31 @@ spec:
3333
apiVersion: apps/v1
3434
kind: Deployment
3535
metadata:
36-
name: unguard-{{.Values.likeService.name}}
36+
name: unguard-{{ .Values.likeService.name }}
3737
labels:
38-
app.kubernetes.io/name: {{.Values.likeService.name}}
38+
app.kubernetes.io/name: {{ .Values.likeService.name }}
3939
app.kubernetes.io/part-of: unguard
4040
{{ include "renderLabels" .Values.labels.common | indent 4 }}
4141
spec:
4242
selector:
4343
matchLabels:
44-
app.kubernetes.io/name: {{.Values.likeService.name}}
44+
app.kubernetes.io/name: {{ .Values.likeService.name }}
4545
app.kubernetes.io/part-of: unguard
4646
strategy:
47-
type: {{.Values.likeService.deployment.strategy.type}}
47+
type: {{ .Values.likeService.deployment.strategy.type }}
4848
template:
4949
metadata:
5050
labels:
51-
app.kubernetes.io/name: {{.Values.likeService.name}}
51+
app.kubernetes.io/name: {{ .Values.likeService.name }}
5252
app.kubernetes.io/part-of: unguard
5353
{{ include "renderLabels" .Values.labels.common | indent 8 }}
5454
spec:
5555
containers:
56-
- name: {{.Values.likeService.name}}
57-
image: {{.Values.likeService.deployment.container.image.repository}}:{{.Values.likeService.deployment.container.image.tag}}
58-
imagePullPolicy: {{.Values.likeService.deployment.container.image.pullPolicy}}
56+
- name: {{ .Values.likeService.name }}
57+
image: {{ .Values.likeService.deployment.container.image.repository }}:{{ .Values.likeService.deployment.container.image.tag }}
58+
imagePullPolicy: {{ .Values.likeService.deployment.container.image.pullPolicy }}
5959
ports:
60-
- containerPort: {{.Values.likeService.deployment.container.ports.containerPort}}
60+
- containerPort: {{ .Values.likeService.deployment.container.ports.containerPort }}
6161
env:
6262
- name: SERVER_PORT
6363
value: {{ quote .Values.likeService.deployment.container.env.SERVER_PORT }}
@@ -71,8 +71,8 @@ spec:
7171
name: {{ tpl .Values.likeService.deployment.container.env.MARIADB_PASSWORD.secretKeyRef.name . }}
7272
key: {{ tpl .Values.likeService.deployment.container.env.MARIADB_PASSWORD.secretKeyRef.key . }}
7373
- name: JAEGER_SERVICE_NAME
74-
value: {{quote (printf "unguard-%s" .Values.likeService.name) }}
75-
{{if .Values.tracing.enabled}}
74+
value: {{ quote (printf "unguard-%s" .Values.likeService.name) }}
75+
{{ if .Values.tracing.enabled }}
7676
- name: JAEGER_COLLECTOR_HOST
7777
value: {{ quote (printf "%s-%s" .Values.jaeger.name .Values.likeService.deployment.container.env.JAEGER_COLLECTOR_HOST) }}
7878
- name: JAEGER_PORT
@@ -81,4 +81,4 @@ spec:
8181
value: {{ quote .Values.likeService.deployment.container.env.SERVICE_NAME }}
8282
- name: JAEGER_DISABLED
8383
value: {{ quote .Values.likeService.deployment.container.env.JAEGER_DISABLED }}
84-
{{end}}
84+
{{ end }}

‎chart/templates/malicious-load-generator.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,35 +13,35 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/}}
16-
{{if .Values.maliciousLoadGenerator.enabled}}
16+
{{ if .Values.maliciousLoadGenerator.enabled }}
1717
apiVersion: apps/v1
1818
kind: Deployment
1919
metadata:
20-
name: unguard-{{.Values.maliciousLoadGenerator.name}}
20+
name: unguard-{{ .Values.maliciousLoadGenerator.name }}
2121
labels:
22-
app.kubernetes.io/name: {{.Values.maliciousLoadGenerator.name}}
22+
app.kubernetes.io/name: {{ .Values.maliciousLoadGenerator.name }}
2323
app.kubernetes.io/part-of: unguard
2424
{{ include "renderLabels" .Values.labels.common | indent 4 }}
2525
spec:
2626
selector:
2727
matchLabels:
28-
app.kubernetes.io/name: {{.Values.maliciousLoadGenerator.name}}
28+
app.kubernetes.io/name: {{ .Values.maliciousLoadGenerator.name }}
2929
app.kubernetes.io/part-of: unguard
3030
strategy:
31-
type: {{.Values.maliciousLoadGenerator.deployment.strategy.type}}
31+
type: {{ .Values.maliciousLoadGenerator.deployment.strategy.type }}
3232
template:
3333
metadata:
3434
labels:
35-
app.kubernetes.io/name: {{.Values.maliciousLoadGenerator.name}}
35+
app.kubernetes.io/name: {{ .Values.maliciousLoadGenerator.name }}
3636
app.kubernetes.io/part-of: unguard
3737
{{ include "renderLabels" .Values.labels.common | indent 8 }}
3838
spec:
39-
terminationGracePeriodSeconds: {{.Values.maliciousLoadGenerator.deployment.terminationGracePeriodSeconds}}
40-
restartPolicy: {{.Values.maliciousLoadGenerator.deployment.restartPolicy}}
39+
terminationGracePeriodSeconds: {{ .Values.maliciousLoadGenerator.deployment.terminationGracePeriodSeconds }}
40+
restartPolicy: {{ .Values.maliciousLoadGenerator.deployment.restartPolicy }}
4141
containers:
42-
- name: {{.Values.maliciousLoadGenerator.name}}
43-
image: {{.Values.maliciousLoadGenerator.deployment.container.image.repository}}:{{.Values.maliciousLoadGenerator.deployment.container.image.tag}}
44-
imagePullPolicy: {{.Values.maliciousLoadGenerator.deployment.container.image.pullPolicy}}
42+
- name: {{ .Values.maliciousLoadGenerator.name }}
43+
image: {{ .Values.maliciousLoadGenerator.deployment.container.image.repository }}:{{ .Values.maliciousLoadGenerator.deployment.container.image.tag }}
44+
imagePullPolicy: {{ .Values.maliciousLoadGenerator.deployment.container.image.pullPolicy }}
4545
env: # could add here run time as well
4646
- name: FRONTEND_ADDR
4747
value: {{ quote .Values.maliciousLoadGenerator.deployment.container.env.FRONTEND_ADDR }}
@@ -55,4 +55,4 @@ spec:
5555
command: [ "/bin/sh", "-c" ]
5656
# TODO: #22 Replace this endpoint with a proper health check endpoint
5757
args: [ 'while [ $(curl -ksw "%{http_code}" "http://unguard-frontend:80/ui/img/logo.svg" -o /dev/null) -ne 200 ]; do sleep 5; echo "health check failed . Waiting for the service..."; done' ]
58-
{{end}}
58+
{{ end }}

0 commit comments

Comments
 (0)