Commit f9de627e authored by Martin Schurz's avatar Martin Schurz
Browse files

fix: enforce consistent indenting of lists 



Signed-off-by: default avatarMartin Schurz <Martin.Schurz@telekom.de>
parent 39428167

assets/auto-deploy-app/templates/cronjob.yaml

+6 −4
Original line number Diff line number Diff line
@@ -55,8 +55,10 @@ items: 
              track: "{{ $.Values.application.track }}"

              tier: cronjob

          spec:

            {{- with $.Values.image.secrets }}

            imagePullSecrets:

              {{- toYaml $.Values.image.secrets | nindent 14 }}

            {{- toYaml . | nindent 12 }}

            {{- end }}

            restartPolicy: {{ default "OnFailure" $jobConfig.restartPolicy }}

            {{- with $nodeSelectorConfig := default $.Values.nodeSelector $jobConfig.nodeSelector -}}

            {{- if $nodeSelectorConfig  }}
@@ -73,7 +75,7 @@ items: 
            {{- with $tolerationsConfig := default $.Values.tolerations $jobConfig.tolerations -}}

            {{- if $tolerationsConfig }}

            tolerations:

            {{- toYaml $tolerationsConfig | nindent 14 }}

            {{- toYaml $tolerationsConfig | nindent 12 }}

            {{- end }}

            {{- end }}

            {{- with $affinityConfig := default $.Values.affinity $jobConfig.affinity -}}
@@ -84,7 +86,7 @@ items: 
            {{- end }}

            {{- if $jobConfig.extraVolumes }}

            volumes:

            {{- toYaml $jobConfig.extraVolumes | nindent 14 }}

            {{- toYaml $jobConfig.extraVolumes | nindent 12 }}

            {{- end }}

            containers:

            - name: {{ $.Chart.Name }}
@@ -198,7 +200,7 @@ items: 
                {{- toYaml $.Values.resources | nindent 16 }}

              {{- if $jobConfig.extraVolumeMounts }}

              volumeMounts:

              {{- toYaml $jobConfig.extraVolumeMounts | nindent 16 }}

              {{- toYaml $jobConfig.extraVolumeMounts | nindent 14 }}

              {{- end }}                

{{- end -}}

{{- end -}}

assets/auto-deploy-app/templates/db-initialize-job.yaml

+3 −1
Original line number Diff line number Diff line
@@ -16,8 +16,10 @@ spec: 
{{ include "sharedlabels" . | indent 8 }}

    spec:

      restartPolicy: Never

      {{- with $.Values.image.secrets }}

      imagePullSecrets:

      {{- toYaml .Values.image.secrets | nindent 8 }}

      {{- toYaml . | nindent 6 }}

      {{- end }}

      containers:

      - name: {{ .Chart.Name }}

        image: {{ template "imagename" . }}

assets/auto-deploy-app/templates/db-migrate-hook.yaml

+3 −1
Original line number Diff line number Diff line
@@ -16,8 +16,10 @@ spec: 
{{ include "sharedlabels" . | indent 8 }}

    spec:

      restartPolicy: Never

      {{- with $.Values.image.secrets }}

      imagePullSecrets:

      {{- toYaml .Values.image.secrets | nindent 8 }}

      {{- toYaml . | nindent 6 }}

      {{- end }}

      containers:

      - name: {{ .Chart.Name }}

        image: {{ template "imagename" . }}

assets/auto-deploy-app/templates/deployment.yaml

+21 −19
Original line number Diff line number Diff line
@@ -47,8 +47,10 @@ spec: 
{{- if or (.Values.serviceAccount.name) (.Values.serviceAccountName) }}

      serviceAccountName: {{ .Values.serviceAccount.name | default .Values.serviceAccountName | quote }}

{{- end }}

      {{- with $.Values.image.secrets }}

      imagePullSecrets:

{{- toYaml .Values.image.secrets | nindent 8 }}

      {{- toYaml . | nindent 6 }}

      {{- end }}

{{- if .Values.nodeSelector }}

      nodeSelector:

{{- toYaml .Values.nodeSelector | nindent 8 }}
@@ -69,7 +71,7 @@ spec: 
{{- end }}

{{- if .Values.tolerations }}

      tolerations:

{{- toYaml .Values.tolerations | nindent 8 }}

{{- toYaml .Values.tolerations | nindent 6 }}

{{- end }}

{{- if .Values.affinity }}

      affinity:
@@ -77,11 +79,11 @@ spec: 
{{- end }}

{{- if .Values.initContainers }}

      initContainers:

{{- toYaml .Values.initContainers | nindent 8 }}

{{- toYaml .Values.initContainers | nindent 6 }}

{{- end }}

{{- if .Values.topologySpreadConstraints }}

      topologySpreadConstraints:

{{- toYaml .Values.topologySpreadConstraints | nindent 8 }}

{{- toYaml .Values.topologySpreadConstraints | nindent 6 }}

{{- end }}

{{- if or (.Values.persistence.enabled) (.Values.extraVolumes) }}

      volumes:
@@ -95,13 +97,13 @@ spec: 
{{- end }}

{{- end }}

{{- if .Values.extraVolumes }}

{{- toYaml .Values.extraVolumes | nindent 8 }}

{{- toYaml .Values.extraVolumes | nindent 6 }}

{{- end }}

{{- end }}

      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}

{{- if .Values.hostAliases }}

      hostAliases:

{{- toYaml .Values.hostAliases | nindent 8 }}

{{- toYaml .Values.hostAliases | nindent 6 }}

{{- end }}

{{- if .Values.priorityClassName }}

      priorityClassName: {{ .Values.priorityClassName }}
@@ -196,7 +198,7 @@ spec: 
{{- else if eq .Values.livenessProbe.probeType "exec" }}

          exec:

            command:

{{- toYaml .Values.livenessProbe.command | nindent 14 }}

{{- toYaml .Values.livenessProbe.command | nindent 12 }}

{{- end }}

          initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}

          timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
@@ -221,7 +223,7 @@ spec: 
{{- else if eq .Values.readinessProbe.probeType "exec" }}

          exec:

            command:

{{- toYaml .Values.readinessProbe.command | nindent 14 }}

{{- toYaml .Values.readinessProbe.command | nindent 12 }}

{{- end }}

          initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}

          timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
@@ -246,7 +248,7 @@ spec: 
{{- else if eq .Values.startupProbe.probeType "exec" }}

          exec:

            command:

{{- toYaml .Values.startupProbe.command | nindent 14 }}

{{- toYaml .Values.startupProbe.command | nindent 12 }}

{{- end }}

          initialDelaySeconds: {{ .Values.startupProbe.initialDelaySeconds }}

          timeoutSeconds: {{ .Values.startupProbe.timeoutSeconds }}
@@ -271,7 +273,7 @@ spec: 
{{- end }}

{{- end }}

{{- if .Values.extraVolumeMounts }}

{{- toYaml .Values.extraVolumeMounts | nindent 10 }}

{{- toYaml .Values.extraVolumeMounts | nindent 8 }}

{{- end }}

{{- end }}

{{- end -}}

assets/auto-deploy-app/templates/worker-deployment.yaml

+10 −10
Original line number Diff line number Diff line
@@ -57,9 +57,9 @@ items: 
{{- end }}

        imagePullSecrets:

{{- if and $workerConfig.image $workerConfig.image.secrets }}

{{- toYaml $workerConfig.image.secrets | nindent 10 }}

{{- else }}

{{- toYaml $.Values.image.secrets | nindent 10 }}

{{- toYaml $workerConfig.image.secrets | nindent 8 }}

{{- else if $.Values.image.secrets }}

{{- toYaml $.Values.image.secrets | nindent 8 }}

{{- end }}

{{- with $nodeSelectorConfig := default $.Values.nodeSelector $workerConfig.nodeSelector -}}

{{- if $nodeSelectorConfig  }}
@@ -92,7 +92,7 @@ items: 
{{- with $tolerationsConfig := default $.Values.tolerations $workerConfig.tolerations -}}

{{- if $tolerationsConfig  }}

        tolerations:

{{- toYaml $tolerationsConfig | nindent 10 }}

{{- toYaml $tolerationsConfig | nindent 8 }}

{{- end }}

{{- end }}

{{- with $affinityConfig := default $.Values.affinity $workerConfig.affinity -}}
@@ -104,17 +104,17 @@ items: 
{{- with $initContainersConfig := default $.Values.initContainers $workerConfig.initContainers -}}

{{- if $initContainersConfig  }}

        initContainers:

{{- toYaml $initContainersConfig | nindent 10 }}

{{- toYaml $initContainersConfig | nindent 8 }}

{{- end }}

{{- end }}

        terminationGracePeriodSeconds: {{ $workerConfig.terminationGracePeriodSeconds }}

{{- if $workerConfig.hostAliases }}

        hostAliases:

{{- toYaml $workerConfig.hostAliases | nindent 10 }}

{{- toYaml $workerConfig.hostAliases | nindent 8 }}

{{- end }}

{{- if $workerConfig.extraVolumes }}

        volumes:

{{- toYaml $workerConfig.extraVolumes | nindent 10 }}

{{- toYaml $workerConfig.extraVolumes | nindent 8 }}

{{- end }}

        containers:

        - name: {{ $.Chart.Name }}-{{ $workerName }}
@@ -167,7 +167,7 @@ items: 
{{- else if eq $livenessProbeConfig.probeType "exec" }}

            exec:

              command:

{{- toYaml $livenessProbeConfig.command | nindent 16 }}

{{- toYaml $livenessProbeConfig.command | nindent 14 }}

{{- end }}

            initialDelaySeconds: {{ $livenessProbeConfig.initialDelaySeconds }}

            timeoutSeconds: {{ $livenessProbeConfig.timeoutSeconds }}
@@ -194,7 +194,7 @@ items: 
{{- else if eq $readinessProbeConfig.probeType "exec" }}

            exec:

              command:

{{- toYaml $readinessProbeConfig.command | nindent 16 }}

{{- toYaml $readinessProbeConfig.command | nindent 14 }}

{{- end }}

            initialDelaySeconds: {{ $readinessProbeConfig.initialDelaySeconds }}

            timeoutSeconds: {{ $readinessProbeConfig.timeoutSeconds }}
@@ -222,7 +222,7 @@ items: 
{{ $workerConfig.resources | default $.Values.resources | toYaml | indent 12 }}

{{- if $workerConfig.extraVolumeMounts }}

          volumeMounts:

{{- toYaml $workerConfig.extraVolumeMounts | nindent 12 }}

{{- toYaml $workerConfig.extraVolumeMounts | nindent 10 }}

{{- end }}

{{- end -}}

{{- end -}}