Refactor indent

Author: upgle

helm/openwhisk/templates/_helpers.tpl

@@ -282,21 +282,21 @@ imagePullSecrets:
 {{/* Environment variables required for invoker volumes configuration */}}
 {{- define "openwhisk.invoker.volumes" -}}
 {{- if eq .Values.invoker.containerFactory.impl "docker" }}
-{{ include "openwhisk.docker_volumes" . | indent 6 }}
-      - name: scripts-dir
-        configMap:
-          name: {{ .Release.Name }}-invoker-scripts
+{{ include "openwhisk.docker_volumes" . }}
+- name: scripts-dir
+  configMap:
+    name: {{ .Release.Name }}-invoker-scripts
 {{- end }}
 {{- end }}
 
 {{/* Environment variables required for invoker volumes configuration */}}
 {{- define "openwhisk.invoker.volume_mounts" -}}
 {{- if (eq .Values.invoker.containerFactory.impl "docker") }}
-{{ include "openwhisk.docker_volume_mounts" . | indent 8 }}
+{{ include "openwhisk.docker_volume_mounts" . }}
 {{- if .Values.invoker.containerFactory.networkConfig.dns.inheritInvokerConfig }}
-        - name: scripts-dir
-          mountPath: "/invoker-scripts/configureDNS.sh"
-          subPath: "configureDNS.sh"
+- name: scripts-dir
+  mountPath: "/invoker-scripts/configureDNS.sh"
+  subPath: "configureDNS.sh"
 {{- end }}
 {{- end }}
 {{- end }}

helm/openwhisk/templates/controller-pod.yaml

@@ -69,7 +69,7 @@ spec:
           secretName: {{ .Release.Name }}-jmxremote-secret
       # The lean controller requires invoker volumes mounts
 {{- if .Values.controller.lean }}
-{{ include "openwhisk.invoker.volumes" . }}
+{{ include "openwhisk.invoker.volumes" . | indent 6 }}
 {{- end }}
 {{ include "openwhisk.docker.imagePullSecrets" . | indent 6 }}
 
@@ -101,7 +101,7 @@ spec:
           mountPath: "/conf/jmxremote.password"
           subPath: "jmxremote.password"
 {{- if .Values.controller.lean }}
-{{ include "openwhisk.invoker.volume_mounts" . }}
+{{ include "openwhisk.invoker.volume_mounts" .  | indent 8 }}
 {{- end }}
         livenessProbe:
           httpGet:

helm/openwhisk/templates/invoker-pod.yaml

@@ -70,7 +70,7 @@ spec:
       - name: jmxremote-secret
         secret:
           secretName: {{ .Release.Name }}-jmxremote-secret
-{{ include "openwhisk.invoker.volumes" . }}
+{{ include "openwhisk.invoker.volumes" .  | indent 6 }}
 
       initContainers:
 {{- if eq .Values.invoker.containerFactory.impl "docker" }}
@@ -204,5 +204,5 @@ spec:
         - name: jmxremote-secret
           mountPath: "/conf/jmxremote.password"
           subPath: "jmxremote.password"
-{{ include "openwhisk.invoker.volume_mounts" . }}
+{{ include "openwhisk.invoker.volume_mounts" . | indent 8 }}
 {{- end }}