Commit 39d9c9e2 authored by Jason Plum's avatar Jason Plum

Merge branch 'dev' into 'master'

Fix: missing certificates initContainer in gitaly

See merge request charts/gitlab!716

(cherry picked from commit 24ae2200)

09508420 Fix: missing certificates initContainer in gitaly
parent fe58f813
Pipeline #51854188 failed with stages
in 10 minutes and 32 seconds
---
title: Add missing certificates initContainer to gitaly
merge_request: 716
author: Harry Lee (tclh123)
type: fixed
......@@ -28,6 +28,7 @@ spec:
terminationGracePeriodSeconds: 30
initContainers:
{{ include "gitlab.extraInitContainers" . | indent 8 }}
{{ include "gitlab.certificates.initContainer" . | indent 8 }}
- name: configure
command: ['sh', '/config/configure']
image: {{ .Values.init.image }}:{{ .Values.init.tag }}
......@@ -96,6 +97,7 @@ spec:
fieldPath: metadata.name
volumeMounts:
{{ include "gitlab.extraVolumeMounts" . | indent 12 }}
{{ include "gitlab.certificates.volumeMount" . | indent 12 }}
- name: gitaly-config
mountPath: '/etc/gitaly/templates'
- name: gitaly-secrets
......@@ -155,6 +157,7 @@ spec:
- key: {{ template "gitlab.redis.password.key" . }}
path: redis_password
{{- end }}
{{ include "gitlab.certificates.volumes" . | indent 6 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 8 }}
......
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