Commit 619a1125 authored by Martin Schurz's avatar Martin Schurz
Browse files

fix: do not create empty newlines when inserting YAML 



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

assets/auto-deploy-app/templates/_helpers.tpl

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version| replace "+" "_" }}" 
app.kubernetes.io/managed-by: {{ .Release.Service }}

app.kubernetes.io/instance: {{ .Release.Name }}

{{- if .Values.extraLabels }}

{{ toYaml $.Values.extraLabels }}

{{- toYaml $.Values.extraLabels }}

{{- end }}

{{- end -}}

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

+14 −14
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ items: 
              {{ if $.Values.gitlab.app }}app.gitlab.com/app: {{ $.Values.gitlab.app | quote }}{{ end }}

              {{ if $.Values.gitlab.env }}app.gitlab.com/env: {{ $.Values.gitlab.env | quote }}{{ end }}

              {{- if $.Values.podAnnotations }}

              {{ toYaml $.Values.podAnnotations | nindent 12 }}

              {{- toYaml $.Values.podAnnotations | nindent 12 }}

              {{- end }}

            labels:

              app: {{ template "appname" $ }}
@@ -48,35 +48,35 @@ items: 
              tier: cronjob

          spec:

            imagePullSecrets:

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

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

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

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

            {{- if $nodeSelectorConfig  }}

            nodeSelector:

            {{ toYaml $nodeSelectorConfig | nindent 14 }}

            {{- toYaml $nodeSelectorConfig | nindent 14 }}

            {{- end }}

            {{- end }}

            {{- with $securityContextConfig := default $.Values.securityContext $jobConfig.securityContext -}}

            {{- if $securityContextConfig }}

            securityContext:

            {{ toYaml $securityContextConfig | nindent 14 }}

            {{- toYaml $securityContextConfig | nindent 14 }}

            {{- end }}

            {{- end }}

            {{- with $tolerationsConfig := default $.Values.tolerations $jobConfig.tolerations -}}

            {{- if $tolerationsConfig }}

            tolerations:

            {{ toYaml $tolerationsConfig | nindent 14 }}

            {{- toYaml $tolerationsConfig | nindent 14 }}

            {{- end }}

            {{- end }}

            {{- with $affinityConfig := default $.Values.affinity $jobConfig.affinity -}}

            {{- if $affinityConfig  }}

            affinity:

            {{ toYaml $affinityConfig | nindent 14 }}

            {{- toYaml $affinityConfig | nindent 14 }}

            {{- end }}

            {{- end }}

            {{- if $jobConfig.extraVolumes }}

            volumes:

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

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

            {{- end }}

            containers:

            - name: {{ $.Chart.Name }}
@@ -99,12 +99,12 @@ items: 
              - secretRef:

                  name: {{ $.Values.application.secretName }}

{{- if $jobConfig.extraEnvFrom }}

{{ toYaml $jobConfig.extraEnvFrom | nindent 14 }}

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

{{- end }}

              {{- else }}

              envFrom:

{{- if $jobConfig.extraEnvFrom }}

{{ toYaml $jobConfig.extraEnvFrom | nindent 14 }}

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

{{- end }}

              {{- end }}

              env:
@@ -150,7 +150,7 @@ items: 
              {{- else if eq $livenessProbeConfig.probeType "exec" }}

                exec:

                  command:

                    {{ toYaml $livenessProbeConfig.command | nindent 18 }}

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

              {{- end }}

                initialDelaySeconds: {{ $livenessProbeConfig.initialDelaySeconds }}

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

                exec:

                  command:

                    {{ toYaml $readinessProbe.command | nindent 18 }}

                    {{- toYaml $readinessProbe.command | nindent 18 }}

                {{- end }}

                initialDelaySeconds: {{ $readinessProbe.initialDelaySeconds }}

                timeoutSeconds: {{ $readinessProbe.timeoutSeconds }}
@@ -183,14 +183,14 @@ items: 
              {{- with $containerSecurityContextConfig := default $.Values.containerSecurityContext $jobConfig.containerSecurityContext -}}

              {{- if $containerSecurityContextConfig }}

              securityContext:

              {{ toYaml $containerSecurityContextConfig | nindent 16 }}

              {{- toYaml $containerSecurityContextConfig | nindent 16 }}

              {{- end }}

              {{- end }}

              resources:

                {{ toYaml $.Values.resources | nindent 16 }}

                {{- toYaml $.Values.resources | nindent 16 }}

              {{- if $jobConfig.extraVolumeMounts }}

              volumeMounts:

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

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

              {{- end }}                

{{- end -}}

{{- end -}}

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

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ spec: 
    spec:

      restartPolicy: Never

      imagePullSecrets:

{{ toYaml .Values.image.secrets | indent 10 }}

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

      containers:

      - name: {{ .Chart.Name }}

        image: {{ template "imagename" . }}

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

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ spec: 
    spec:

      restartPolicy: Never

      imagePullSecrets:

{{ toYaml .Values.image.secrets | indent 10 }}

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

      containers:

      - name: {{ .Chart.Name }}

        image: {{ template "imagename" . }}

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

+23 −23
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ spec: 
        {{ if .Values.gitlab.app }}app.gitlab.com/app: {{ .Values.gitlab.app | quote }}{{ end }}

        {{ if .Values.gitlab.env }}app.gitlab.com/env: {{ .Values.gitlab.env | quote }}{{ end }}

{{- if .Values.podAnnotations }}

{{ toYaml .Values.podAnnotations | indent 8 }}

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

{{- end }}

      labels:

        track: "{{ .Values.application.track }}"
@@ -40,14 +40,14 @@ spec: 
      serviceAccountName: {{ .Values.serviceAccount.name | default .Values.serviceAccountName | quote }}

{{- end }}

      imagePullSecrets:

{{ toYaml .Values.image.secrets | indent 10 }}

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

{{- if .Values.nodeSelector }}

      nodeSelector:

{{ toYaml .Values.nodeSelector | indent 8 }}

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

{{- end }}

{{- if .Values.securityContext }}

      securityContext:

{{ toYaml .Values.securityContext | indent 8 }}

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

{{- end }}

{{- if .Values.hostNetwork }}

      hostNetwork: {{ .Values.hostNetwork }}
@@ -57,23 +57,23 @@ spec: 
{{- end }}

{{- if .Values.dnsConfig }}

      dnsConfig:

{{ toYaml .Values.dnsConfig | indent 8 }}

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

{{- end }}

{{- if .Values.tolerations }}

      tolerations:

{{ toYaml .Values.tolerations | indent 8 }}

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

{{- end }}

{{- if .Values.affinity }}

      affinity:

{{ toYaml .Values.affinity | indent 8 }}

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

{{- end }}

{{- if .Values.initContainers }}

      initContainers:

{{ toYaml .Values.initContainers | indent 8 }}

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

{{- end }}

{{- if .Values.topologySpreadConstraints }}

      topologySpreadConstraints:

{{ toYaml .Values.topologySpreadConstraints | indent 8 }}

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

{{- end }}

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

      volumes:
@@ -87,13 +87,13 @@ spec: 
{{- end }}

{{- end }}

{{- if .Values.extraVolumes }}

{{ toYaml .Values.extraVolumes | indent 8 }}

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

{{- end }}

{{- end }}

      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}

{{- if .Values.hostAliases }}

      hostAliases:

{{ toYaml .Values.hostAliases | indent 8 }}

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

{{- end }}

{{- if .Values.priorityClassName }}

      priorityClassName: {{ .Values.priorityClassName }}
@@ -104,28 +104,28 @@ spec: 
        imagePullPolicy: {{ .Values.image.pullPolicy }}

{{- if .Values.application.command }}

        command:

{{ toYaml .Values.application.command | indent 8 }}

{{- toYaml .Values.application.command | nindent 8 }}

{{- end }}

{{- if .Values.application.args }}

        args:

{{ toYaml .Values.application.args | indent 8 }}

{{- toYaml .Values.application.args | nindent 8 }}

{{- end }}

        {{- if .Values.application.secretName }}

        envFrom:

        - secretRef:

            name: {{ .Values.application.secretName }}

{{- if .Values.extraEnvFrom }}

{{ toYaml .Values.extraEnvFrom | indent 8 }}

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

{{- end }}

        {{- else}}

        envFrom:

{{- if .Values.extraEnvFrom }}

{{ toYaml .Values.extraEnvFrom | indent 8 }}

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

{{- end }}

        {{- end }}

        env:

{{- if .Values.extraEnv }}

{{ toYaml .Values.extraEnv | indent 8 }}

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

{{- end }}

{{- if .Values.postgresql.managed }}

        - name: POSTGRES_USER
@@ -154,7 +154,7 @@ spec: 
          value: {{ .Values.gitlab.envURL | quote }}

{{- if .Values.lifecycle }}

        lifecycle:

{{ toYaml .Values.lifecycle | indent 10 }}

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

{{- end }}

        ports:

        - name: "{{ .Values.service.name }}"
@@ -188,7 +188,7 @@ spec: 
{{- else if eq .Values.livenessProbe.probeType "exec" }}

          exec:

            command:

{{ toYaml .Values.livenessProbe.command | indent 14 }}

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

{{- end }}

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

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

          exec:

            command:

{{ toYaml .Values.readinessProbe.command | indent 14 }}

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

{{- end }}

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

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

          exec:

            command:

{{ toYaml .Values.startupProbe.command | indent 14 }}

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

{{- end }}

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

          timeoutSeconds: {{ .Values.startupProbe.timeoutSeconds }}
@@ -247,10 +247,10 @@ spec: 
{{- end }}

{{- if .Values.containerSecurityContext }}

        securityContext:

{{ toYaml .Values.containerSecurityContext | indent 10 }}

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

{{- end }}

        resources:

{{ toYaml .Values.resources | indent 12 }}

{{- toYaml .Values.resources | nindent 12 }}

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

        volumeMounts:

{{- if .Values.persistence.enabled }}
@@ -263,7 +263,7 @@ spec: 
{{- end }}

{{- end }}

{{- if .Values.extraVolumeMounts }}

{{ toYaml .Values.extraVolumeMounts | indent 10 }}

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

{{- end }}

{{- end }}

{{- end -}}