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