Commit e305f58e authored by Sandro Mathys's avatar Sandro Mathys
Browse files

must remove trim now that we use nintend

parent 63299ae5
......@@ -67,11 +67,11 @@ spec:
command: ["shibd", "-t"]
{{- if .Values.backend.readinessProbe }}
readinessProbe:
{{ .Values.backend.readinessProbe | toYaml | nindent 12 }}
{{- .Values.backend.readinessProbe | toYaml | nindent 12 }}
{{- end }}
{{- if .Values.backend.livenessProbe }}
livenessProbe:
{{ .Values.backend.livenessProbe | toYaml | nindent 12 }}
{{- .Values.backend.livenessProbe | toYaml | nindent 12 }}
{{- end }}
resources:
{{- toYaml .Values.backend.resources | nindent 12 }}
......@@ -112,7 +112,7 @@ spec:
mountPath: /var/cache/shibboleth
readOnly: false
{{- if .Values.backend.volumeMounts }}
{{- .Values.backend.volumeMounts | toYaml | nindent 12 | trim }}
{{- .Values.backend.volumeMounts | toYaml | nindent 12 }}
{{- end }}
- name: apache-init
securityContext:
......@@ -137,10 +137,10 @@ spec:
mountPath: /etc/apache2/sites-enabled
readOnly: true
{{- if .Values.frontend.volumeMounts }}
{{- .Values.frontend.volumeMounts | toYaml | nindent 12 | trim }}
{{- .Values.frontend.volumeMounts | toYaml | nindent 12 }}
{{- end }}
{{- if .Values.initContainers }}
{{- .Values.initContainers | toYaml | nindent 8 | trim }}
{{- .Values.initContainers | toYaml | nindent 8 }}
{{- end }}
containers:
- name: shibboleth
......@@ -191,7 +191,7 @@ spec:
mountPath: /var/cache/shibboleth
readOnly: false
{{- if .Values.backend.volumeMounts }}
{{- .Values.backend.volumeMounts | toYaml | nindent 12 | trim }}
{{- .Values.backend.volumeMounts | toYaml | nindent 12 }}
{{- end }}
- name: apache
securityContext:
......@@ -239,10 +239,10 @@ spec:
mountPath: /etc/shibboleth/shibboleth2.xml
readOnly: true
{{- if .Values.frontend.volumeMounts }}
{{- .Values.frontend.volumeMounts | toYaml | nindent 12 | trim }}
{{- .Values.frontend.volumeMounts | toYaml | nindent 12 }}
{{- end }}
{{- if .Values.containers }}
{{- .Values.containers | toYaml | nindent 8 | trim }}
{{- .Values.containers | toYaml | nindent 8 }}
{{- end }}
volumes:
- name: {{ include "shibboleth-sp.backend.fullname" . }}-config
......@@ -296,7 +296,7 @@ spec:
name: {{ include "shibboleth-sp.frontend.fullname" . }}-sites
{{- end }}
{{- if .Values.volumes }}
{{- tpl (.Values.volumes | toYaml) . | nindent 8 | trim }}
{{- tpl (.Values.volumes | toYaml) . | nindent 8 }}
{{- end }}
dnsPolicy: ClusterFirst
restartPolicy: Always
Supports Markdown
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