Skip to content

k8s-ingress
k8s-ingress
Commit 47a3f937 authored by Lars Fenneberg's avatar Lars Fenneberg
Browse files
Options

Helm charts: Beautify template output a little bit

parent 9598c469
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 15 deletions
charts/viking-service/templates/deployment.yaml
View file @ 47a3f937
...@@ -11,7 +11,7 @@ metadata: ...@@ -11,7 +11,7 @@ metadata:
name: {{ template "viking-service.fullname" . }} name: {{ template "viking-service.fullname" . }}
{{- if .Values.vikingService.annotations }} {{- if .Values.vikingService.annotations }}
annotations: annotations:
{{ toYaml .Values.vikingService.annotations | nindent 4}} {{- toYaml .Values.vikingService.annotations | nindent 4}}
{{- end }} {{- end }}
spec: spec:
{{/* Try to collect kind specific differences here */}} {{/* Try to collect kind specific differences here */}}
...@@ -45,31 +45,31 @@ spec: ...@@ -45,31 +45,31 @@ spec:
metadata: metadata:
{{- if .Values.vikingService.podAnnotations }} {{- if .Values.vikingService.podAnnotations }}
annotations: annotations:
{{ toYaml .Values.vikingService.podAnnotations | nindent 8 }} {{- toYaml .Values.vikingService.podAnnotations | nindent 8 }}
{{- end }} {{- end }}
labels: labels:
app.kubernetes.io/name: {{ template "viking-service.name" . }} app.kubernetes.io/name: {{ template "viking-service.name" . }}
app.kubernetes.io/component: service app.kubernetes.io/component: service
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
{{- if .Values.vikingService.podLabels }} {{- if .Values.vikingService.podLabels }}
{{ toYaml .Values.vikingService.podLabels | nindent 8 }} {{- toYaml .Values.vikingService.podLabels | nindent 8 }}
{{- end }} {{- end }}
spec: spec:
{{- if .Values.vikingService.dnsConfig }} {{- if .Values.vikingService.dnsConfig }}
dnsConfig: dnsConfig:
{{ toYaml .Values.vikingService.dnsConfig | nindent 8 }} {{- toYaml .Values.vikingService.dnsConfig | nindent 8 }}
{{- end }} {{- end }}
dnsPolicy: {{ .Values.vikingService.dnsPolicy }} dnsPolicy: {{ .Values.vikingService.dnsPolicy }}
{{- if .Values.imagePullSecrets }} {{- if .Values.imagePullSecrets }}
imagePullSecrets: imagePullSecrets:
{{ toYaml .Values.imagePullSecrets | nindent 8 }} {{- toYaml .Values.imagePullSecrets | nindent 8 }}
{{- end }} {{- end }}
{{- if .Values.vikingService.priorityClassName }} {{- if .Values.vikingService.priorityClassName }}
priorityClassName: "{{ .Values.vikingService.priorityClassName }}" priorityClassName: "{{ .Values.vikingService.priorityClassName }}"
{{- end }} {{- end }}
{{- if .Values.vikingService.podSecurityContext }} {{- if .Values.vikingService.podSecurityContext }}
securityContext: securityContext:
{{ toYaml .Values.vikingService.podSecurityContext | nindent 8 }} {{- toYaml .Values.vikingService.podSecurityContext | nindent 8 }}
{{- end }} {{- end }}
containers: containers:
- name: varnish - name: varnish
...@@ -79,7 +79,7 @@ spec: ...@@ -79,7 +79,7 @@ spec:
- -n - -n
- /run/varnish-home - /run/varnish-home
{{- if .Values.vikingService.varnish.extraArgs }} {{- if .Values.vikingService.varnish.extraArgs }}
{{ toYaml .Values.vikingService.varnish.extraArgs | nindent 12 }} {{- toYaml .Values.vikingService.varnish.extraArgs | nindent 12 }}
{{- end }} {{- end }}
env: env:
- name: POD_NAME - name: POD_NAME
...@@ -91,7 +91,7 @@ spec: ...@@ -91,7 +91,7 @@ spec:
fieldRef: fieldRef:
fieldPath: metadata.namespace fieldPath: metadata.namespace
{{- if .Values.vikingService.varnish.extraEnvs }} {{- if .Values.vikingService.varnish.extraEnvs }}
{{ toYaml .Values.vikingService.varnish.extraEnvs | nindent 12 }} {{- toYaml .Values.vikingService.varnish.extraEnvs | nindent 12 }}
{{- end }} {{- end }}
livenessProbe: livenessProbe:
exec: exec:
...@@ -128,7 +128,7 @@ spec: ...@@ -128,7 +128,7 @@ spec:
securityContext: securityContext:
readOnlyRootFilesystem: true readOnlyRootFilesystem: true
resources: resources:
{{ toYaml .Values.vikingService.varnish.resources | nindent 12 }} {{- toYaml .Values.vikingService.varnish.resources | nindent 12 }}
- name: haproxy - name: haproxy
image: "{{ .Values.vikingService.haproxy.image.repository }}:{{ .Values.vikingService.haproxy.image.tag }}" image: "{{ .Values.vikingService.haproxy.image.repository }}:{{ .Values.vikingService.haproxy.image.tag }}"
imagePullPolicy: "{{ .Values.vikingService.haproxy.image.pullPolicy }}" imagePullPolicy: "{{ .Values.vikingService.haproxy.image.pullPolicy }}"
...@@ -176,19 +176,19 @@ spec: ...@@ -176,19 +176,19 @@ spec:
securityContext: securityContext:
readOnlyRootFilesystem: true readOnlyRootFilesystem: true
resources: resources:
{{ toYaml .Values.vikingService.haproxy.resources | nindent 12 }} {{- toYaml .Values.vikingService.haproxy.resources | nindent 12 }}
hostNetwork: {{ .Values.vikingService.hostNetwork }} hostNetwork: {{ .Values.vikingService.hostNetwork }}
{{- if .Values.vikingService.nodeSelector }} {{- if .Values.vikingService.nodeSelector }}
nodeSelector: nodeSelector:
{{ toYaml .Values.vikingService.nodeSelector | nindent 8 }} {{- toYaml .Values.vikingService.nodeSelector | nindent 8 }}
{{- end }} {{- end }}
{{- if .Values.vikingService.tolerations }} {{- if .Values.vikingService.tolerations }}
tolerations: tolerations:
{{ toYaml .Values.vikingService.tolerations | nindent 8 }} {{- toYaml .Values.vikingService.tolerations | nindent 8 }}
{{- end }} {{- end }}
{{- if .Values.vikingService.affinity }} {{- if .Values.vikingService.affinity }}
affinity: affinity:
{{ toYaml .Values.vikingService.affinity | nindent 8 }} {{- toYaml .Values.vikingService.affinity | nindent 8 }}
{{- end }} {{- end }}
serviceAccountName: {{ template "viking-service.fullname" . }} serviceAccountName: {{ template "viking-service.fullname" . }}
terminationGracePeriodSeconds: {{ .Values.vikingService.terminationGracePeriodSeconds }} terminationGracePeriodSeconds: {{ .Values.vikingService.terminationGracePeriodSeconds }}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment