From 734287262f12d88b28497fa9d10489282231cc51 Mon Sep 17 00:00:00 2001 From: Adam Mulvany Date: Wed, 7 Dec 2022 08:44:24 +0000 Subject: [PATCH 1/2] Fix missing microsoft_graph_mailer secret dir --- charts/gitlab/templates/_configure.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/gitlab/templates/_configure.tpl b/charts/gitlab/templates/_configure.tpl index 9855187348..11d62899c2 100644 --- a/charts/gitlab/templates/_configure.tpl +++ b/charts/gitlab/templates/_configure.tpl @@ -3,7 +3,7 @@ {{ include "gitlab.scripts.configure.secrets" ( dict "required" "your required secrets dirs" // optional, default "shell gitaly registry rails-secrets gitlab-workhorse" - "optional" "your optional secrets dirs" // optional, default "redis minio objectstorage postgres ldap omniauth smtp kas pages oauth-secrets mailroom gitlab-exporter" + "optional" "your optional secrets dirs" // optional, default "redis minio objectstorage postgres ldap omniauth smtp kas pages oauth-secrets mailroom gitlab-exporter microsoft_graph_mailer" ) }} - Either can be disabled with "none" -- GitLab From 0d83492c97a11282f4f5a4c69e6e5bd7e9a9308e Mon Sep 17 00:00:00 2001 From: Adam Mulvany Date: Thu, 8 Dec 2022 05:22:15 +0000 Subject: [PATCH 2/2] Update charts/gitlab/charts/sidekiq/templates/configmap.yaml, charts/gitlab/charts/webservice/templates/configmap.yml --- charts/gitlab/charts/sidekiq/templates/configmap.yaml | 2 +- charts/gitlab/charts/webservice/templates/configmap.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/gitlab/charts/sidekiq/templates/configmap.yaml b/charts/gitlab/charts/sidekiq/templates/configmap.yaml index 943b9d3e6e..6694652bea 100644 --- a/charts/gitlab/charts/sidekiq/templates/configmap.yaml +++ b/charts/gitlab/charts/sidekiq/templates/configmap.yaml @@ -135,7 +135,7 @@ data: address: 0.0.0.0 port: {{ .Values.health_checks.port }} configure: | - {{- include "gitlab.scripts.configure.secrets" (dict "required" "gitaly registry rails-secrets") | nindent 4 }} + {{{- include "gitlab.scripts.configure.secrets" (dict "required" "gitaly registry rails-secrets microsoft_graph_mailer"") | nindent 4 }} {{- if $.Values.metrics.tls.enabled }} mkdir -p /init-secrets/sidekiq-metrics cp -v -L /init-config/sidekiq-metrics/sidekiq-metrics.crt /init-secrets/sidekiq-metrics/sidekiq-metrics.crt diff --git a/charts/gitlab/charts/webservice/templates/configmap.yml b/charts/gitlab/charts/webservice/templates/configmap.yml index 5416044056..d307189285 100644 --- a/charts/gitlab/charts/webservice/templates/configmap.yml +++ b/charts/gitlab/charts/webservice/templates/configmap.yml @@ -150,7 +150,7 @@ data: {{- include "gitlab.appConfig.registry.configuration" $ | nindent 6 }} {{- include "gitlab.appConfig.smartcard.configuration" $ | nindent 6 }} configure: | - {{- include "gitlab.scripts.configure.secrets" (dict) | nindent 4 }} + {{- include "gitlab.scripts.configure.secrets" (dict "redis minio objectstorage postgres ldap omniauth smtp kas pages oauth-secrets mailroom gitlab-exporter microsoft_graph_mailer") | nindent 4 }} {{- include "gitlab.psql.ssl.initScript" . | nindent 4 }} {{- include "gitlab.geo.psql.ssl.initScript" . | nindent 4 }} {{- if $.Values.tls.enabled }} -- GitLab