From a83520113c1f16eca2e2ebbc164f16295465f634 Mon Sep 17 00:00:00 2001 From: Filipe Santos Date: Fri, 12 Jul 2024 08:45:32 +1200 Subject: [PATCH] Standardize whitespace --- .../templates/issuer-job.yaml | 4 +- .../geo-logcursor/templates/deployment.yaml | 14 +++---- .../gitaly/templates/_statefulset_spec.yaml | 12 +++--- .../gitlab-exporter/templates/deployment.yaml | 10 ++--- .../gitlab-pages/templates/deployment.yaml | 10 ++--- .../gitlab-shell/templates/deployment.yaml | 14 +++---- .../charts/kas/templates/deployment.yaml | 6 +-- .../charts/mailroom/templates/deployment.yaml | 10 ++--- .../charts/migrations/templates/_jobspec.yaml | 10 ++--- .../praefect/templates/statefulset.yaml | 6 +-- .../charts/sidekiq/templates/deployment.yaml | 14 +++---- .../spamcheck/templates/deployment.yaml | 4 +- .../charts/toolbox/templates/backup-job.yaml | 10 ++--- .../charts/toolbox/templates/deployment.yaml | 10 ++--- .../webservice/templates/deployment.yaml | 16 ++++---- charts/gitlab/templates/_helpers.tpl | 12 +++--- .../minio/templates/create-buckets-job.yaml | 4 +- charts/minio/templates/minio_deployment.yaml | 8 ++-- charts/registry/templates/deployment.yaml | 14 +++---- charts/registry/templates/migrations-job.yaml | 6 +-- templates/_application.tpl | 2 +- templates/_certificates.tpl | 8 ++-- templates/_helpers.tpl | 40 +++++++++---------- templates/_image.tpl | 10 ++--- templates/shared-secrets/job.yaml | 2 +- .../shared-secrets/self-signed-cert-job.yml | 4 +- templates/upgrade_check_hook.yaml | 2 +- 27 files changed, 131 insertions(+), 131 deletions(-) diff --git a/charts/certmanager-issuer/templates/issuer-job.yaml b/charts/certmanager-issuer/templates/issuer-job.yaml index 7878755db3..f7935a890e 100644 --- a/charts/certmanager-issuer/templates/issuer-job.yaml +++ b/charts/certmanager-issuer/templates/issuer-job.yaml @@ -24,13 +24,13 @@ spec: serviceAccountName: {{ template "fullname" . }} {{- end }} restartPolicy: OnFailure - {{- include "gitlab.image.pullSecrets" $imageCfg | indent 6}} + {{- include "gitlab.image.pullSecrets" $imageCfg | nindent 6}} {{- include "gitlab.priorityClassName" . | nindent 6 }} containers: - name: create-issuer image: {{ include "gitlab.kubectl.image" . }} command: ['/bin/bash', '/scripts/create-issuer', '/scripts/issuer.yml'] - {{- include "gitlab.image.pullPolicy" $imageCfg | indent 10 }} + {{- include "gitlab.image.pullPolicy" $imageCfg | nindent 10 }} volumeMounts: - name: scripts mountPath: /scripts diff --git a/charts/gitlab/charts/geo-logcursor/templates/deployment.yaml b/charts/gitlab/charts/geo-logcursor/templates/deployment.yaml index 2da184ef40..3a578c0d0a 100644 --- a/charts/gitlab/charts/geo-logcursor/templates/deployment.yaml +++ b/charts/gitlab/charts/geo-logcursor/templates/deployment.yaml @@ -68,8 +68,8 @@ spec: command: ['sh'] args: [ '-c', 'sh -x /config-logcursor/configure'] image: {{ include "gitlab.configure.image" (dict "root" $ "image" .Values.init.image) | quote }} - {{- include "gitlab.image.pullPolicy" $initImageCfg | indent 10 }} - {{- include "gitlab.init.containerSecurityContext" $ | indent 10 }} + {{- include "gitlab.image.pullPolicy" $initImageCfg | nindent 10 }} + {{- include "gitlab.init.containerSecurityContext" $ | nindent 10 }} env: {{- include "gitlab.extraEnv" . | nindent 10 }} {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" .) | nindent 10 }} @@ -90,8 +90,8 @@ spec: {{- toYaml .Values.init.resources | nindent 12 }} - name: dependencies image: "{{ coalesce .Values.image.repository (include "image.repository" .) }}:{{ coalesce .Values.image.tag (include "gitlab.versionTag" . ) }}{{ include "gitlab.image.tagSuffix" . }}" - {{- include "gitlab.image.pullPolicy" $imageCfg | indent 10 }} - {{- include "gitlab.init.containerSecurityContext" $ | indent 10 }} + {{- include "gitlab.image.pullPolicy" $imageCfg | nindent 10 }} + {{- include "gitlab.init.containerSecurityContext" $ | nindent 10 }} args: - /scripts/wait-for-deps env: @@ -118,13 +118,13 @@ spec: readOnly: true resources: {{- toYaml .Values.init.resources | nindent 12 }} - {{- include "gitlab.image.pullSecrets" $imageCfg | indent 6 }} + {{- include "gitlab.image.pullSecrets" $imageCfg | nindent 6 }} containers: {{- include "gitlab.extraContainers" . | nindent 8 }} - name: {{ .Chart.Name }} image: "{{ coalesce .Values.image.repository (include "image.repository" .) }}:{{ coalesce .Values.image.tag (include "gitlab.versionTag" . ) }}{{ include "gitlab.image.tagSuffix" . }}" - {{- include "gitlab.image.pullPolicy" $imageCfg | indent 10 }} - {{- include "gitlab.containerSecurityContext" $ | indent 10 }} + {{- include "gitlab.image.pullPolicy" $imageCfg | nindent 10 }} + {{- include "gitlab.containerSecurityContext" $ | nindent 10 }} env: - name: GITALY_FEATURE_DEFAULT_ON value: "1" diff --git a/charts/gitlab/charts/gitaly/templates/_statefulset_spec.yaml b/charts/gitlab/charts/gitaly/templates/_statefulset_spec.yaml index 4cdd8b1397..98258ed385 100644 --- a/charts/gitlab/charts/gitaly/templates/_statefulset_spec.yaml +++ b/charts/gitlab/charts/gitaly/templates/_statefulset_spec.yaml @@ -59,7 +59,7 @@ spec: {{- if .Values.cgroups.enabled }} - name: init-cgroups image: {{ include "gitlab.configure.image" (dict "root" $ "image" .Values.cgroups.initContainer.image) | quote }} - {{- include "gitlab.image.pullPolicy" $initCgroupsImageCfg | indent 10 }} + {{- include "gitlab.image.pullPolicy" $initCgroupsImageCfg | nindent 10 }} {{- include "gitlab.podSecurityContextRoot" .Values.cgroups.initContainer.securityContext | nindent 10 }} env: - name: GITALY_POD_UID @@ -88,8 +88,8 @@ spec: - name: configure command: ['sh', '/config/configure'] image: {{ include "gitlab.configure.image" (dict "root" $ "image" .Values.init.image) | quote }} - {{- include "gitlab.image.pullPolicy" $initImageCfg | indent 10 }} - {{- include "gitlab.init.containerSecurityContext" . | indent 10 }} + {{- include "gitlab.image.pullPolicy" $initImageCfg | nindent 10 }} + {{- include "gitlab.init.containerSecurityContext" . | nindent 10 }} env: {{- include "gitlab.extraEnv" . | nindent 12 }} {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" .) | nindent 12 }} @@ -107,7 +107,7 @@ spec: resources: {{- toYaml .Values.init.resources | nindent 12 }} {{- include "gitlab.podSecurityContext" .Values.securityContext | nindent 6 }} - {{- include "gitlab.image.pullSecrets" $imageCfg | indent 6 }} + {{- include "gitlab.image.pullSecrets" $imageCfg | nindent 6 }} {{- if eq (default .Values.global.antiAffinity .Values.antiAffinity) "hard" }} affinity: podAntiAffinity: @@ -141,8 +141,8 @@ spec: {{- include "gitlab.extraContainers" . | nindent 8 }} - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ coalesce .Values.image.tag (include "gitlab.parseAppVersion" (dict "appVersion" .Chart.AppVersion "prepend" "true")) }}{{ include "gitlab.image.tagSuffix" . }}" - {{- include "gitlab.image.pullPolicy" $imageCfg | indent 10 }} - {{- include "gitlab.containerSecurityContext" . | indent 10 }} + {{- include "gitlab.image.pullPolicy" $imageCfg | nindent 10 }} + {{- include "gitlab.containerSecurityContext" . | nindent 10 }} ports: - containerPort: {{ coalesce .Values.service.internalPort .Values.global.gitaly.service.internalPort }} name: grpc-gitaly diff --git a/charts/gitlab/charts/gitlab-exporter/templates/deployment.yaml b/charts/gitlab/charts/gitlab-exporter/templates/deployment.yaml index 8dbc8024d6..c4fa875379 100644 --- a/charts/gitlab/charts/gitlab-exporter/templates/deployment.yaml +++ b/charts/gitlab/charts/gitlab-exporter/templates/deployment.yaml @@ -76,8 +76,8 @@ spec: - name: configure command: ['sh', '/config/configure'] image: {{ include "gitlab.configure.image" (dict "root" $ "image" .Values.init.image) | quote }} - {{- include "gitlab.image.pullPolicy" $initImageCfg | indent 10 }} - {{- include "gitlab.init.containerSecurityContext" . | indent 10 }} + {{- include "gitlab.image.pullPolicy" $initImageCfg | nindent 10 }} + {{- include "gitlab.init.containerSecurityContext" . | nindent 10 }} env: {{- include "gitlab.extraEnv" . | nindent 10 }} {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" .) | nindent 10 }} @@ -95,13 +95,13 @@ spec: readOnly: false resources: {{- toYaml .Values.init.resources | nindent 12 }} - {{- include "gitlab.image.pullSecrets" $imageCfg | indent 6 }} + {{- include "gitlab.image.pullSecrets" $imageCfg | nindent 6 }} containers: {{- include "gitlab.extraContainers" . | nindent 8 }} - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ coalesce .Values.image.tag .Chart.AppVersion }}{{ include "gitlab.image.tagSuffix" . }}" - {{- include "gitlab.image.pullPolicy" $imageCfg | indent 10 }} - {{- include "gitlab.containerSecurityContext" . | indent 10 }} + {{- include "gitlab.image.pullPolicy" $imageCfg | nindent 10 }} + {{- include "gitlab.containerSecurityContext" . | nindent 10 }} env: - name: CONFIG_TEMPLATE_DIRECTORY value: '/var/opt/gitlab-exporter/templates' diff --git a/charts/gitlab/charts/gitlab-pages/templates/deployment.yaml b/charts/gitlab/charts/gitlab-pages/templates/deployment.yaml index e8c699b714..42559142e3 100644 --- a/charts/gitlab/charts/gitlab-pages/templates/deployment.yaml +++ b/charts/gitlab/charts/gitlab-pages/templates/deployment.yaml @@ -82,8 +82,8 @@ spec: - name: configure command: ['sh', '/config/configure'] image: {{ include "gitlab.configure.image" (dict "root" $ "image" $.Values.init.image) | quote }} - {{- include "gitlab.image.pullPolicy" $initImageCfg | indent 10 }} - {{- include "gitlab.init.containerSecurityContext" $ | indent 10 }} + {{- include "gitlab.image.pullPolicy" $initImageCfg | nindent 10 }} + {{- include "gitlab.init.containerSecurityContext" $ | nindent 10 }} env: {{- include "gitlab.extraEnv" $ | nindent 12 }} {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" .) | nindent 12 }} @@ -100,13 +100,13 @@ spec: readOnly: false resources: {{- toYaml $.Values.init.resources | nindent 12 }} - {{- include "gitlab.image.pullSecrets" $imageCfg | indent 6 }} + {{- include "gitlab.image.pullSecrets" $imageCfg | nindent 6 }} containers: {{- include "gitlab.extraContainers" . | nindent 8 }} - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ coalesce .Values.image.tag (include "gitlab.parseAppVersion" (dict "appVersion" .Chart.AppVersion "prepend" "true")) }}{{ include "gitlab.image.tagSuffix" . }}" - {{- include "gitlab.image.pullPolicy" $imageCfg | indent 10 }} - {{- include "gitlab.containerSecurityContext" $ | indent 10 }} + {{- include "gitlab.image.pullPolicy" $imageCfg | nindent 10 }} + {{- include "gitlab.containerSecurityContext" $ | nindent 10 }} env: {{- include "gitlab.extraEnv" $ | nindent 12 }} {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" .) | nindent 12 }} diff --git a/charts/gitlab/charts/gitlab-shell/templates/deployment.yaml b/charts/gitlab/charts/gitlab-shell/templates/deployment.yaml index 9529efab01..7341d75d54 100644 --- a/charts/gitlab/charts/gitlab-shell/templates/deployment.yaml +++ b/charts/gitlab/charts/gitlab-shell/templates/deployment.yaml @@ -55,11 +55,11 @@ spec: - name: configure command: ['sh', '/config/configure'] image: {{ include "gitlab.configure.image" (dict "root" $ "image" .Values.init.image) | quote }} - {{- include "gitlab.image.pullPolicy" $initImageCfg | indent 10 }} - {{- include "gitlab.init.containerSecurityContext" . | indent 10 }} + {{- include "gitlab.image.pullPolicy" $initImageCfg | nindent 10 }} + {{- include "gitlab.init.containerSecurityContext" . | nindent 10 }} env: - {{- include "gitlab.extraEnv" . | nindent 10 }} - {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" .) | nindent 10 }} + {{- include "gitlab.extraEnv" . | nindent 12 }} + {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" .) | nindent 12 }} volumeMounts: {{- include "gitlab.extraVolumeMounts" . | nindent 10 }} - name: shell-config @@ -74,7 +74,7 @@ spec: resources: {{- toYaml .Values.init.resources | nindent 12 }} {{- include "gitlab.podSecurityContext" .Values.securityContext | nindent 6 }} - {{- include "gitlab.image.pullSecrets" $imageCfg | indent 6 }} + {{- include "gitlab.image.pullSecrets" $imageCfg | nindent 6 }} {{- if eq (default .Values.global.antiAffinity .Values.antiAffinity) "hard" }} affinity: podAntiAffinity: @@ -102,8 +102,8 @@ spec: {{- include "gitlab.extraContainers" . | nindent 8 }} - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ coalesce .Values.image.tag (include "gitlab.parseAppVersion" (dict "appVersion" .Chart.AppVersion "prepend" "true")) }}{{ include "gitlab.image.tagSuffix" . }}" - {{- include "gitlab.image.pullPolicy" $imageCfg | indent 10 }} - {{- include "gitlab.containerSecurityContext" . | indent 10 }} + {{- include "gitlab.image.pullPolicy" $imageCfg | nindent 10 }} + {{- include "gitlab.containerSecurityContext" . | nindent 10 }} ports: {{- if .Values.metrics.enabled }} - containerPort: {{ .Values.metrics.port }} diff --git a/charts/gitlab/charts/kas/templates/deployment.yaml b/charts/gitlab/charts/kas/templates/deployment.yaml index 1d27b84868..fea13e2835 100644 --- a/charts/gitlab/charts/kas/templates/deployment.yaml +++ b/charts/gitlab/charts/kas/templates/deployment.yaml @@ -70,7 +70,7 @@ spec: {{- include "gitlab.selectorLabels" . | nindent 18 }} {{- end }} {{- include "gitlab.podSecurityContext" .Values.securityContext | nindent 6 }} - {{- include "gitlab.image.pullSecrets" $imageCfg | indent 6 }} + {{- include "gitlab.image.pullSecrets" $imageCfg | nindent 6 }} {{- include "gitlab.priorityClassName" . | nindent 6 }} initContainers: {{- include "gitlab.certificates.initContainer" . | nindent 8 }} @@ -78,8 +78,8 @@ spec: {{- include "gitlab.extraContainers" . | nindent 8 }} - name: {{ template "name" . }} image: "{{ .Values.image.repository }}:{{ coalesce .Values.image.tag (include "gitlab.parseAppVersion" (dict "appVersion" .Chart.AppVersion "prepend" "true")) }}{{ include "gitlab.image.tagSuffix" . }}" - {{- include "gitlab.image.pullPolicy" $imageCfg | indent 10 }} - {{- include "gitlab.containerSecurityContext" $ | indent 10 }} + {{- include "gitlab.image.pullPolicy" $imageCfg | nindent 10 }} + {{- include "gitlab.containerSecurityContext" $ | nindent 10 }} args: - "--configuration-file=/etc/kas/config.yaml" env: diff --git a/charts/gitlab/charts/mailroom/templates/deployment.yaml b/charts/gitlab/charts/mailroom/templates/deployment.yaml index 34e56ff032..09002fd0a0 100644 --- a/charts/gitlab/charts/mailroom/templates/deployment.yaml +++ b/charts/gitlab/charts/mailroom/templates/deployment.yaml @@ -63,8 +63,8 @@ spec: - name: configure command: ['sh', '/config/configure'] image: {{ include "gitlab.configure.image" (dict "root" $ "image" .Values.init.image) | quote }} - {{- include "gitlab.image.pullPolicy" $initImageCfg | indent 10 }} - {{- include "gitlab.init.containerSecurityContext" $ | indent 10 }} + {{- include "gitlab.image.pullPolicy" $initImageCfg | nindent 10 }} + {{- include "gitlab.init.containerSecurityContext" $ | nindent 10 }} env: {{- include "gitlab.extraEnv" . | nindent 10 }} {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" .) | nindent 12 }} @@ -82,13 +82,13 @@ spec: readOnly: false resources: {{- toYaml .Values.init.resources | nindent 12 }} - {{- include "gitlab.image.pullSecrets" $imageCfg | indent 6 }} + {{- include "gitlab.image.pullSecrets" $imageCfg | nindent 6 }} containers: {{- include "gitlab.extraContainers" . | nindent 8 }} - name: {{ .Chart.Name }} image: {{ include "gitlab.image.fullPath" $imageCfg }} - {{- include "gitlab.image.pullPolicy" $imageCfg | indent 10 }} - {{- include "gitlab.containerSecurityContext" $ | indent 10 }} + {{- include "gitlab.image.pullPolicy" $imageCfg | nindent 10 }} + {{- include "gitlab.containerSecurityContext" $ | nindent 10 }} env: {{- include "gitlab.extraEnv" . | nindent 10 }} {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" .) | nindent 10 }} diff --git a/charts/gitlab/charts/migrations/templates/_jobspec.yaml b/charts/gitlab/charts/migrations/templates/_jobspec.yaml index ff0ffc6952..9f3cdd760f 100644 --- a/charts/gitlab/charts/migrations/templates/_jobspec.yaml +++ b/charts/gitlab/charts/migrations/templates/_jobspec.yaml @@ -48,8 +48,8 @@ spec: - name: configure command: ['sh', '/config/configure'] image: {{ include "gitlab.configure.image" (dict "root" $ "image" .Values.init.image) | quote }} - {{- include "gitlab.image.pullPolicy" $initImageCfg | indent 10 }} - {{- include "gitlab.init.containerSecurityContext" $ | indent 10 }} + {{- include "gitlab.image.pullPolicy" $initImageCfg | nindent 10 }} + {{- include "gitlab.init.containerSecurityContext" $ | nindent 10 }} env: {{- include "gitlab.extraEnv" . | nindent 10 }} {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" .) | nindent 10 }} @@ -69,7 +69,7 @@ spec: resources: {{- toYaml .Values.init.resources | nindent 12 }} restartPolicy: OnFailure - {{- include "gitlab.image.pullSecrets" $imageCfg | indent 6 }} + {{- include "gitlab.image.pullSecrets" $imageCfg | nindent 6 }} containers: {{- include "gitlab.extraContainers" . | nindent 8 }} - name: {{ .Chart.Name }} @@ -81,8 +81,8 @@ spec: {{- else }} - /scripts/db-migrate {{- end}} - {{- include "gitlab.image.pullPolicy" $imageCfg | indent 10 }} - {{- include "gitlab.containerSecurityContext" $ | indent 10 }} + {{- include "gitlab.image.pullPolicy" $imageCfg | nindent 10 }} + {{- include "gitlab.containerSecurityContext" $ | nindent 10 }} env: - name: CONFIG_TEMPLATE_DIRECTORY value: '/var/opt/gitlab/templates' diff --git a/charts/gitlab/charts/praefect/templates/statefulset.yaml b/charts/gitlab/charts/praefect/templates/statefulset.yaml index 7d58776b7a..e5b1d7cd5f 100644 --- a/charts/gitlab/charts/praefect/templates/statefulset.yaml +++ b/charts/gitlab/charts/praefect/templates/statefulset.yaml @@ -69,7 +69,7 @@ spec: - name: configure command: ['sh', '/config/configure'] image: {{ include "gitlab.configure.image" (dict "root" $ "image" .Values.init.image) | quote }} - {{- include "gitlab.image.pullPolicy" $initImageCfg | indent 10 }} + {{- include "gitlab.image.pullPolicy" $initImageCfg | nindent 10 }} env: {{- include "gitlab.extraEnv" $ | nindent 10 }} {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" .) | nindent 10 }} @@ -87,7 +87,7 @@ spec: resources: {{- toYaml $.Values.init.resources | nindent 12 }} {{- include "gitlab.podSecurityContext" .Values.securityContext | nindent 6 }} - {{- include "gitlab.image.pullSecrets" $imageCfg | indent 6 }} + {{- include "gitlab.image.pullSecrets" $imageCfg | nindent 6 }} {{- if or .Values.serviceAccount.enabled .Values.global.serviceAccount.enabled }} serviceAccountName: {{ include "gitlab.serviceAccount.name" . }} {{- end }} @@ -95,7 +95,7 @@ spec: {{- include "gitlab.extraContainers" . | nindent 6 }} - name: {{ $.Chart.Name }} image: "{{ $.Values.image.repository }}:{{ coalesce $.Values.image.tag (include "gitlab.parseAppVersion" (dict "appVersion" $.Chart.AppVersion "prepend" "true")) }}{{ include "gitlab.image.tagSuffix" . }}" - {{- include "gitlab.image.pullPolicy" $imageCfg | indent 8 }} + {{- include "gitlab.image.pullPolicy" $imageCfg | nindent 8 }} ports: - containerPort: {{ include "gitlab.praefect.internalPort" $ }} {{- if $.Values.global.praefect.tls.enabled }} diff --git a/charts/gitlab/charts/sidekiq/templates/deployment.yaml b/charts/gitlab/charts/sidekiq/templates/deployment.yaml index ec3b8caf36..116caf471d 100644 --- a/charts/gitlab/charts/sidekiq/templates/deployment.yaml +++ b/charts/gitlab/charts/sidekiq/templates/deployment.yaml @@ -114,8 +114,8 @@ spec: - name: configure command: ['sh', '/config/configure'] image: {{ include "gitlab.configure.image" (dict "root" $ "image" $.Values.init.image) | quote }} - {{- include "gitlab.image.pullPolicy" $initImageCfg | indent 10 }} - {{- include "gitlab.init.containerSecurityContext" $ | indent 10 }} + {{- include "gitlab.image.pullPolicy" $initImageCfg | nindent 10 }} + {{- include "gitlab.init.containerSecurityContext" $ | nindent 10 }} env: {{- include "gitlab.extraEnv" $ | nindent 10 }} {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" .) | nindent 10 }} @@ -137,8 +137,8 @@ spec: {{- toYaml $.Values.init.resources | nindent 12 }} - name: dependencies image: "{{ $image }}" - {{- include "gitlab.image.pullPolicy" $imageCfg | indent 10 }} - {{- include "gitlab.init.containerSecurityContext" $ | indent 10 }} + {{- include "gitlab.image.pullPolicy" $imageCfg | nindent 10 }} + {{- include "gitlab.init.containerSecurityContext" $ | nindent 10 }} args: - /scripts/wait-for-deps env: @@ -174,13 +174,13 @@ spec: readOnly: true resources: {{- toYaml $.Values.init.resources | nindent 12 }} - {{- include "gitlab.image.pullSecrets" $imageCfg | indent 6 }} + {{- include "gitlab.image.pullSecrets" $imageCfg | nindent 6 }} containers: {{- include "gitlab.extraContainers" $ | nindent 8 }} - name: {{ $name }} image: "{{ $image }}" - {{- include "gitlab.image.pullPolicy" $imageCfg | indent 10 }} - {{- include "gitlab.containerSecurityContext" $ | indent 10 }} + {{- include "gitlab.image.pullPolicy" $imageCfg | nindent 10 }} + {{- include "gitlab.containerSecurityContext" $ | nindent 10 }} env: {{- if $metricsEnabled }} - name: prometheus_multiproc_dir diff --git a/charts/gitlab/charts/spamcheck/templates/deployment.yaml b/charts/gitlab/charts/spamcheck/templates/deployment.yaml index e3b10d30f2..f00188147c 100644 --- a/charts/gitlab/charts/spamcheck/templates/deployment.yaml +++ b/charts/gitlab/charts/spamcheck/templates/deployment.yaml @@ -59,7 +59,7 @@ spec: matchLabels: {{- include "gitlab.selectorLabels" . | nindent 18 }} {{- end }} - {{- include "gitlab.image.pullSecrets" $imageCfg | indent 6 }} + {{- include "gitlab.image.pullSecrets" $imageCfg | nindent 6 }} {{- include "gitlab.priorityClassName" . | nindent 6 }} initContainers: {{- include "gitlab.extraInitContainers" . | nindent 8 }} @@ -68,7 +68,7 @@ spec: {{- include "gitlab.extraContainers" . | nindent 8 }} - name: {{ .Chart.Name }} image: {{ include "gitlab.image.fullPath" $imageCfg }} - {{- include "gitlab.image.pullPolicy" $imageCfg | indent 10 }} + {{- include "gitlab.image.pullPolicy" $imageCfg | nindent 10 }} ports: - name: grpc containerPort: {{ $.Values.service.internalPort }} diff --git a/charts/gitlab/charts/toolbox/templates/backup-job.yaml b/charts/gitlab/charts/toolbox/templates/backup-job.yaml index 85bdb5ca25..0a8c9bb3b4 100644 --- a/charts/gitlab/charts/toolbox/templates/backup-job.yaml +++ b/charts/gitlab/charts/toolbox/templates/backup-job.yaml @@ -59,8 +59,8 @@ spec: - name: configure command: ['sh', '/config/configure'] image: {{ include "gitlab.configure.image" (dict "root" $ "image" .Values.init.image) | quote }} - {{- include "gitlab.image.pullPolicy" $initImageCfg | indent 14 }} - {{- include "gitlab.init.containerSecurityContext" . | indent 14 }} + {{- include "gitlab.image.pullPolicy" $initImageCfg | nindent 14 }} + {{- include "gitlab.init.containerSecurityContext" . | nindent 14 }} env: {{- include "gitlab.extraEnv" $ | nindent 16 }} {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" .) | nindent 16 }} @@ -78,7 +78,7 @@ spec: readOnly: false resources: {{- toYaml .Values.init.resources | nindent 16 }} - {{- include "gitlab.image.pullSecrets" $imageCfg | indent 10 }} + {{- include "gitlab.image.pullSecrets" $imageCfg | nindent 10 }} containers: {{- include "gitlab.extraContainers" . | nindent 12 }} - name: {{ .Chart.Name }}-backup @@ -93,8 +93,8 @@ spec: - backup-utility {{ .Values.backups.cron.extraArgs }} {{- end }} image: "{{ coalesce .Values.image.repository (include "image.repository" .) }}:{{ coalesce .Values.image.tag (include "gitlab.versionTag" . ) }}{{ include "gitlab.image.tagSuffix" . }}" - {{- include "gitlab.image.pullPolicy" $imageCfg | indent 14 }} - {{- include "gitlab.containerSecurityContext" . | indent 14 }} + {{- include "gitlab.image.pullPolicy" $imageCfg | nindent 14 }} + {{- include "gitlab.containerSecurityContext" . | nindent 14 }} env: {{- include "gitlab.extraEnv" $ | nindent 16 }} {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" .) | nindent 16 }} diff --git a/charts/gitlab/charts/toolbox/templates/deployment.yaml b/charts/gitlab/charts/toolbox/templates/deployment.yaml index 193ed00154..93c37dad2b 100644 --- a/charts/gitlab/charts/toolbox/templates/deployment.yaml +++ b/charts/gitlab/charts/toolbox/templates/deployment.yaml @@ -49,8 +49,8 @@ spec: - name: configure command: ['sh', '/config/configure'] image: {{ include "gitlab.configure.image" (dict "root" $ "image" .Values.init.image) | quote }} - {{- include "gitlab.image.pullPolicy" $initImageCfg | indent 10 }} - {{- include "gitlab.init.containerSecurityContext" . | indent 10 }} + {{- include "gitlab.image.pullPolicy" $initImageCfg | nindent 10 }} + {{- include "gitlab.init.containerSecurityContext" . | nindent 10 }} env: {{- include "gitlab.extraEnv" . | nindent 10 }} {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" .) | nindent 10 }} @@ -69,7 +69,7 @@ spec: readOnly: false resources: {{- toYaml .Values.init.resources | nindent 12 }} - {{- include "gitlab.image.pullSecrets" $imageCfg | indent 6 }} + {{- include "gitlab.image.pullSecrets" $imageCfg | nindent 6 }} {{- if .Values.antiAffinityLabels.matchLabels }} {{- if eq (default .Values.global.antiAffinity .Values.antiAffinity) "hard" }} affinity: @@ -107,8 +107,8 @@ spec: - while sleep 3600; do :; done {{- end }} image: "{{ coalesce .Values.image.repository (include "image.repository" .) }}:{{ coalesce .Values.image.tag (include "gitlab.versionTag" . ) }}{{ include "gitlab.image.tagSuffix" . }}" - {{- include "gitlab.image.pullPolicy" $imageCfg | indent 10 }} - {{- include "gitlab.containerSecurityContext" . | indent 10 }} + {{- include "gitlab.image.pullPolicy" $imageCfg | nindent 10 }} + {{- include "gitlab.containerSecurityContext" . | nindent 10 }} env: - name: ARTIFACTS_BUCKET_NAME value: {{ .Values.global.appConfig.artifacts.bucket }} diff --git a/charts/gitlab/charts/webservice/templates/deployment.yaml b/charts/gitlab/charts/webservice/templates/deployment.yaml index d9af67ade3..7686e31024 100644 --- a/charts/gitlab/charts/webservice/templates/deployment.yaml +++ b/charts/gitlab/charts/webservice/templates/deployment.yaml @@ -111,8 +111,8 @@ spec: command: ['sh'] args: [ '-c', 'sh -x /config-webservice/configure ; sh -x /config-workhorse/configure ; mkdir -p -m 3770 /tmp/gitlab'] image: {{ include "gitlab.configure.image" (dict "root" $ "image" $.Values.init.image ) | quote }} - {{- include "gitlab.image.pullPolicy" $initImageCfg | indent 10 }} - {{- include "gitlab.init.containerSecurityContext" $ | indent 10 }} + {{- include "gitlab.image.pullPolicy" $initImageCfg | nindent 10 }} + {{- include "gitlab.init.containerSecurityContext" $ | nindent 10 }} env: {{- include "webservice.extraEnv" (dict "global" $.Values.global "local" .) | nindent 12 }} {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" .) | nindent 12 }} @@ -142,8 +142,8 @@ spec: {{- toYaml $.Values.init.resources | nindent 12 }} - name: dependencies image: {{ include "webservice.image" $ }} - {{- include "gitlab.image.pullPolicy" $imageCfg | indent 10 }} - {{- include "gitlab.init.containerSecurityContext" $ | indent 10 }} + {{- include "gitlab.image.pullPolicy" $imageCfg | nindent 10 }} + {{- include "gitlab.init.containerSecurityContext" $ | nindent 10 }} args: - /scripts/wait-for-deps env: @@ -175,13 +175,13 @@ spec: readOnly: true resources: {{- toYaml $.Values.init.resources | nindent 12 }} - {{- include "gitlab.image.pullSecrets" $imageCfg | indent 6 }} + {{- include "gitlab.image.pullSecrets" $imageCfg | nindent 6 }} containers: {{- include "gitlab.extraContainers" $ | nindent 8 }} - name: {{ $.Chart.Name }} image: {{ include "webservice.image" $ }} - {{- include "gitlab.image.pullPolicy" $imageCfg | indent 10 }} - {{- include "gitlab.containerSecurityContext" $ | indent 10 }} + {{- include "gitlab.image.pullPolicy" $imageCfg | nindent 10 }} + {{- include "gitlab.containerSecurityContext" $ | nindent 10 }} ports: {{- if $.Values.http.enabled }} - containerPort: {{ $.Values.service.internalPort }} @@ -339,7 +339,7 @@ spec: {{- toYaml .resources | nindent 12 }} - name: gitlab-workhorse image: "{{ coalesce $.Values.workhorse.image (include "workhorse.repository" $) }}:{{ coalesce $.Values.workhorse.tag (include "gitlab.versionTag" $ ) }}{{ include "gitlab.image.tagSuffix" $ }}" - {{- include "gitlab.image.pullPolicy" $imageCfg | indent 10 }} + {{- include "gitlab.image.pullPolicy" $imageCfg | nindent 10 }} {{- if $.Values.workhorse.containerSecurityContext }} securityContext: {{- toYaml $.Values.workhorse.containerSecurityContext | nindent 12 }} diff --git a/charts/gitlab/templates/_helpers.tpl b/charts/gitlab/templates/_helpers.tpl index 3a10a62821..b8a47d360e 100644 --- a/charts/gitlab/templates/_helpers.tpl +++ b/charts/gitlab/templates/_helpers.tpl @@ -21,11 +21,11 @@ {{- $values := deepCopy (get .root.Values "extraEnvFrom" | default (dict)) -}} {{- $local := deepCopy (get .local "extraEnvFrom" | default (dict)) -}} {{- $allExtraEnvFrom := mergeOverwrite $global $values $local -}} -{{- range $key, $value := $allExtraEnvFrom }} +{{- range $key, $value := $allExtraEnvFrom -}} - name: {{ $key }} - valueFrom: -{{ toYaml $value | nindent 4 }} -{{- end -}} + valueFrom: + {{ toYaml $value | nindent 4 }} +{{ end -}} {{- end -}} {{/* @@ -35,10 +35,10 @@ Global values will override any chart-specific values. */}} {{- define "gitlab.extraEnv" -}} {{- $allExtraEnv := merge (default (dict) .Values.extraEnv) .Values.global.extraEnv -}} -{{- range $key, $value := $allExtraEnv }} +{{- $myvar := range $key, $value := $allExtraEnv -}} - name: {{ $key }} value: {{ $value | quote }} -{{- end -}} +{{ end -}} {{- end -}} {{/* diff --git a/charts/minio/templates/create-buckets-job.yaml b/charts/minio/templates/create-buckets-job.yaml index d960488526..2bcc870f48 100755 --- a/charts/minio/templates/create-buckets-job.yaml +++ b/charts/minio/templates/create-buckets-job.yaml @@ -43,11 +43,11 @@ spec: name: {{ template "minio.fullname" . }}-config-cm - secret: name: {{ template "gitlab.minio.credentials.secret" . }} - {{- include "gitlab.image.pullSecrets" $imageCfg | indent 6}} + {{- include "gitlab.image.pullSecrets" $imageCfg | nindent 6}} containers: - name: minio-mc image: {{ .Values.minioMc.image }}:{{ .Values.minioMc.tag }} - {{- include "gitlab.image.pullPolicy" $imageCfg | indent 8 }} + {{- include "gitlab.image.pullPolicy" $imageCfg | nindent 8 }} command: ["/bin/sh", "/config/initialize"] env: - name: MINIO_ENDPOINT diff --git a/charts/minio/templates/minio_deployment.yaml b/charts/minio/templates/minio_deployment.yaml index 64f46bb7db..8e19719968 100755 --- a/charts/minio/templates/minio_deployment.yaml +++ b/charts/minio/templates/minio_deployment.yaml @@ -70,7 +70,7 @@ spec: initContainers: - name: configure image: {{ include "gitlab.configure.image" (dict "root" $ "image" .Values.init.image) | quote }} - {{- include "gitlab.image.pullPolicy" $initImageCfg | indent 10 }} + {{- include "gitlab.image.pullPolicy" $initImageCfg | nindent 10 }} command: ["sh", "/config/configure"] volumeMounts: - name: minio-configuration @@ -78,12 +78,12 @@ spec: - name: minio-server-config mountPath: /minio resources: -{{ toYaml .Values.init.resources | indent 12 }} - {{- include "gitlab.image.pullSecrets" $imageCfg | indent 6}} + {{ toYaml .Values.init.resources | nindent 12 }} + {{- include "gitlab.image.pullSecrets" $imageCfg | nindent 6}} containers: - name: minio image: {{ .Values.image }}:{{ .Values.imageTag }} - {{- include "gitlab.image.pullPolicy" $imageCfg | indent 10 }} + {{- include "gitlab.image.pullPolicy" $imageCfg | nindent 10 }} args: ["-C", "{{ default "/tmp/.minio" .Values.configPath }}", "--quiet", "server", "{{ .Values.mountPath }}"] volumeMounts: - name: export diff --git a/charts/registry/templates/deployment.yaml b/charts/registry/templates/deployment.yaml index 4c1fcdf664..e80155b2f1 100644 --- a/charts/registry/templates/deployment.yaml +++ b/charts/registry/templates/deployment.yaml @@ -62,8 +62,8 @@ spec: {{- include "gitlab.certificates.initContainer" . | nindent 8 }} - name: configure image: {{ include "gitlab.configure.image" (dict "root" $ "image" .Values.init.image) | quote }} - {{- include "gitlab.image.pullPolicy" $initImageCfg | indent 10 }} - {{- include "gitlab.init.containerSecurityContext" $ | indent 10 }} + {{- include "gitlab.image.pullPolicy" $initImageCfg | nindent 10 }} + {{- include "gitlab.init.containerSecurityContext" $ | nindent 10 }} args: ["sh", "/config/configure"] volumeMounts: - name: registry-secrets @@ -85,8 +85,8 @@ spec: {{- if or .Values.database.enabled .Values.database.configure }} - name: dependencies image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}{{ include "gitlab.image.tagSuffix" . }}" - {{- include "gitlab.image.pullPolicy" $imageCfg | indent 10 }} - {{- include "gitlab.init.containerSecurityContext" $ | indent 10 }} + {{- include "gitlab.image.pullPolicy" $imageCfg | nindent 10 }} + {{- include "gitlab.init.containerSecurityContext" $ | nindent 10 }} command: ["/scripts/wait-for-deps"] volumeMounts: - name: registry-server-config @@ -98,12 +98,12 @@ spec: {{- include "gitlab.extraEnv" . | nindent 10 }} {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" .) | nindent 10 }} {{- end }} - {{- include "gitlab.image.pullSecrets" $imageCfg | indent 6 }} + {{- include "gitlab.image.pullSecrets" $imageCfg | nindent 6 }} containers: - name: registry image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}{{ include "gitlab.image.tagSuffix" . }}" - {{- include "gitlab.image.pullPolicy" $imageCfg | indent 10 }} - {{- include "gitlab.containerSecurityContext" $ | indent 10 }} + {{- include "gitlab.image.pullPolicy" $imageCfg | nindent 10 }} + {{- include "gitlab.containerSecurityContext" $ | nindent 10 }} env: {{- include "gitlab.extraEnv" . | nindent 10 }} {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" .) | nindent 10 }} diff --git a/charts/registry/templates/migrations-job.yaml b/charts/registry/templates/migrations-job.yaml index 1d0a18266a..48aa7e1038 100644 --- a/charts/registry/templates/migrations-job.yaml +++ b/charts/registry/templates/migrations-job.yaml @@ -51,7 +51,7 @@ spec: {{- if .Values.init.image.pullPolicy }} imagePullPolicy: {{ .Values.init.image.pullPolicy }} {{- else }} - {{- include "gitlab.image.pullPolicy" $initImageCfg | indent 8 }} + {{- include "gitlab.image.pullPolicy" $initImageCfg | nindent 8 }} {{- end }} args: ['sh', '/config/configure'] volumeMounts: @@ -72,7 +72,7 @@ spec: {{- include "gitlab.extraEnv" . | nindent 10 }} {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" .) | nindent 10 }} restartPolicy: OnFailure - {{- include "gitlab.image.pullSecrets" (dict "global" .Values.global.image "local" .Values.image) | indent 6 }} + {{- include "gitlab.image.pullSecrets" (dict "global" .Values.global.image "local" .Values.image) | nindent 6 }} containers: {{- include "gitlab.extraContainers" . | nindent 6 }} - name: migrations @@ -80,7 +80,7 @@ spec: {{- if .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy}} {{- else }} - {{- include "gitlab.image.pullPolicy" $imageCfg | indent 8 }} + {{- include "gitlab.image.pullPolicy" $imageCfg | nindent 8 }} {{- end }} args: - /scripts/wait-for-deps diff --git a/templates/_application.tpl b/templates/_application.tpl index 95639daf23..dfd978192c 100644 --- a/templates/_application.tpl +++ b/templates/_application.tpl @@ -57,7 +57,7 @@ Return priorityClassName for Pod definitions */}} {{- define "gitlab.priorityClassName" -}} {{- $pcName := default .Values.global.priorityClassName .Values.priorityClassName -}} -{{- if $pcName }} +{{- if $pcName -}} priorityClassName: {{ $pcName }} {{- end -}} {{- end -}} diff --git a/templates/_certificates.tpl b/templates/_certificates.tpl index 51a205cae5..f276eeab65 100644 --- a/templates/_certificates.tpl +++ b/templates/_certificates.tpl @@ -8,11 +8,11 @@ {{- $imageCfg := dict "global" .Values.global.image "local" .Values.global.certificates.image -}} - name: certificates image: {{ include "gitlab.certificates.image" . }} - {{- include "gitlab.image.pullPolicy" $imageCfg | indent 2 }} - {{- include "gitlab.init.containerSecurityContext" . | indent 2 }} + {{- include "gitlab.image.pullPolicy" $imageCfg | nindent 2 }} + {{- include "gitlab.init.containerSecurityContext" . | nindent 2 }} env: - {{- include "gitlab.extraEnv" . | nindent 2 }} - {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" .) | nindent 2 }} + {{- include "gitlab.extraEnv" . | nindent 4 }} + {{- include "gitlab.extraEnvFrom" (dict "root" $ "local" .) | nindent 4 }} volumeMounts: - name: etc-ssl-certs mountPath: /etc/ssl/certs diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl index 9f344b9160..53a4012530 100644 --- a/templates/_helpers.tpl +++ b/templates/_helpers.tpl @@ -504,12 +504,12 @@ emptyDir: {{ toYaml $values | nindent 2 }} {{/* Return init container specific securityContext template */}} -{{- define "gitlab.init.containerSecurityContext" }} -{{- if .Values.init.containerSecurityContext }} +{{- define "gitlab.init.containerSecurityContext" -}} +{{- if .Values.init.containerSecurityContext -}} securityContext: {{- toYaml .Values.init.containerSecurityContext | nindent 2 }} -{{- end }} -{{- end }} +{{- end -}} +{{- end -}} {{/* Return container specific securityContext template @@ -518,8 +518,8 @@ Return container specific securityContext template {{- if .Values.containerSecurityContext }} securityContext: {{- toYaml .Values.containerSecurityContext | nindent 2 }} -{{- end }} -{{- end }} +{{- end -}} +{{- end -}} {{/* Return a PodSecurityContext definition. @@ -528,22 +528,22 @@ Usage: {{ include "gitlab.podSecurityContext" .Values.securityContext }} */}} {{- define "gitlab.podSecurityContext" -}} -{{- $psc := . }} -{{- if $psc }} +{{- $psc := . -}} +{{- if $psc -}} securityContext: {{- if not (empty $psc.runAsUser) }} runAsUser: {{ $psc.runAsUser }} -{{- end }} +{{- end -}} {{- if not (empty $psc.runAsGroup) }} runAsGroup: {{ $psc.runAsGroup }} -{{- end }} +{{- end -}} {{- if not (empty $psc.fsGroup) }} fsGroup: {{ $psc.fsGroup }} -{{- end }} +{{- end -}} {{- if not (empty $psc.fsGroupChangePolicy) }} fsGroupChangePolicy: {{ $psc.fsGroupChangePolicy }} -{{- end }} -{{- end }} +{{- end -}} +{{- end -}} {{- end -}} {{/* @@ -553,22 +553,22 @@ Usage: {{ include "gitlab.podSecurityContextRoot" .Values.securityContext }} */}} {{- define "gitlab.podSecurityContextRoot" -}} -{{- $psc := . }} -{{- if $psc }} +{{- $psc := . -}} +{{- if $psc -}} securityContext: {{- if not (eq $psc.runAsUser nil) }} runAsUser: {{ $psc.runAsUser }} -{{- end }} +{{- end -}} {{- if not (eq $psc.runAsGroup nil) }} runAsGroup: {{ $psc.runAsGroup }} -{{- end }} +{{- end -}} {{- if not (eq $psc.fsGroup nil) }} fsGroup: {{ $psc.fsGroup }} -{{- end }} +{{- end -}} {{- if not (eq $psc.fsGroupChangePolicy nil) }} fsGroupChangePolicy: {{ $psc.fsGroupChangePolicy }} -{{- end }} -{{- end }} +{{- end -}} +{{- end -}} {{- end -}} {{/* diff --git a/templates/_image.tpl b/templates/_image.tpl index c81da9db0d..b634bcf55e 100644 --- a/templates/_image.tpl +++ b/templates/_image.tpl @@ -36,12 +36,12 @@ Usage: {{- if .local.pullSecrets -}} {{- $pullSecrets = concat $pullSecrets .local.pullSecrets -}} {{- end -}} -{{- if $pullSecrets }} +{{- if $pullSecrets -}} imagePullSecrets: {{- range $index, $entry := $pullSecrets }} -- name: {{ $entry.name }} + - name: {{ $entry.name }} {{- end }} -{{- end }} +{{- end -}} {{- end -}} {{/* @@ -53,7 +53,7 @@ imagePullSecrets: */}} {{- define "gitlab.image.pullPolicy" -}} {{- $pullPolicy := coalesce .local.pullPolicy .global.pullPolicy -}} -{{- if $pullPolicy }} +{{- if $pullPolicy -}} imagePullPolicy: {{ $pullPolicy | quote }} {{- end -}} {{- end -}} @@ -66,7 +66,7 @@ Allow configuring a standard suffix on all images in chart {{ .Values.global.image.tagSuffix }} {{- else if hasKey . "global" -}} {{ .global.image.tagSuffix }} -{{- else }} +{{- else -}} "" {{- end -}} {{- end -}} diff --git a/templates/shared-secrets/job.yaml b/templates/shared-secrets/job.yaml index 4cf5d898ab..1742b5533f 100644 --- a/templates/shared-secrets/job.yaml +++ b/templates/shared-secrets/job.yaml @@ -43,7 +43,7 @@ spec: containers: - name: {{ .Chart.Name }} image: {{ include "gitlab.kubectl.image" . }} - {{- include "gitlab.image.pullPolicy" $imageCfg | indent 10 }} + {{- include "gitlab.image.pullPolicy" $imageCfg | nindent 10 }} command: ['/bin/bash', '/scripts/generate-secrets'] volumeMounts: - name: scripts diff --git a/templates/shared-secrets/self-signed-cert-job.yml b/templates/shared-secrets/self-signed-cert-job.yml index c92f467c39..ca0de21b43 100644 --- a/templates/shared-secrets/self-signed-cert-job.yml +++ b/templates/shared-secrets/self-signed-cert-job.yml @@ -44,7 +44,7 @@ spec: initContainers: - name: cfssl-self-sign image: {{ include "gitlab.selfsign.image" . }} - {{- include "gitlab.image.pullPolicy" $imageCfgSelfsign | indent 8 }} + {{- include "gitlab.image.pullPolicy" $imageCfgSelfsign | nindent 8 }} env: - name: CA_SUBJECT value: {{ $sharedSecretValues.selfsign.caSubject | quote }} # defaults to GitLab in container @@ -70,7 +70,7 @@ spec: containers: - name: kubectl image: {{ include "gitlab.kubectl.image" . }} - {{- include "gitlab.image.pullPolicy" $imageCfgKubectl | indent 8 }} + {{- include "gitlab.image.pullPolicy" $imageCfgKubectl | nindent 8 }} command: - /bin/bash - -exc diff --git a/templates/upgrade_check_hook.yaml b/templates/upgrade_check_hook.yaml index 2276760875..517c1a0f5c 100644 --- a/templates/upgrade_check_hook.yaml +++ b/templates/upgrade_check_hook.yaml @@ -67,7 +67,7 @@ spec: - name: run-check image: {{ include "gitlab.configure.image" (dict "root" $ "image" .Values.upgradeCheck.image) | quote }} command: ['/bin/sh', '/scripts/runcheck'] - {{- include "gitlab.image.pullPolicy" $imageCfg | indent 10 }} + {{- include "gitlab.image.pullPolicy" $imageCfg | nindent 10 }} env: - name: GITLAB_VERSION value: '{{ coalesce .Values.global.gitlabVersion .Chart.AppVersion }}' -- GitLab