From 27804ab5507b4c757f90618e53c8462c7b3d9f83 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <iwiedler@gitlab.com>
Date: Mon, 3 May 2021 19:46:03 +0200
Subject: [PATCH] create a separate configmap per webservice

---
 .../charts/webservice/templates/configmap.yml | 30 ++++++++++++-------
 .../webservice/templates/deployment.yaml      |  2 +-
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/charts/gitlab/charts/webservice/templates/configmap.yml b/charts/gitlab/charts/webservice/templates/configmap.yml
index a000ab55f9..d8a793c14c 100644
--- a/charts/gitlab/charts/webservice/templates/configmap.yml
+++ b/charts/gitlab/charts/webservice/templates/configmap.yml
@@ -143,37 +143,46 @@ data:
     {{- include "gitlab.scripts.configure.secrets" (dict) | nindent 4 -}}
     {{- include "gitlab.psql.ssl.initScript" . | nindent 4 }}
     {{- include "gitlab.geo.psql.ssl.initScript" . | nindent 4 }}
+
+{{- include "webservice.datamodel.prepare" $ -}}
+{{/* BEGIN range deployments */}}
+{{- range $.Values.deployments -}}
+{{/*
+From here on:
+- `.` is `.deployments.xyz` value
+- `.name` is the key (xyz)
+*/}}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{.Release.Name }}-workhorse-config
+  name: {{ $.Release.Name }}-workhorse-config-{{ .name }}
   namespace: {{ $.Release.Namespace }}
   labels:
-    {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.standardLabels" $ | nindent 4 }}
 data:
   installation_type: |
     gitlab-helm-chart
   workhorse-config.toml.erb: |
     [redis]
-    {{- if not .Values.global.redis.sentinels }}
-    URL = "{{ template "gitlab.redis.scheme" . }}://{{ template "gitlab.redis.host" . }}:{{ template "gitlab.redis.port" . }}"
+    {{- if not $.Values.global.redis.sentinels }}
+    URL = "{{ template "gitlab.redis.scheme" $ }}://{{ template "gitlab.redis.host" $ }}:{{ template "gitlab.redis.port" $ }}"
     {{- else }}
-    SentinelMaster = "{{ template "gitlab.redis.host" . }}"
-    Sentinel = [ {{ template "gitlab.redis.workhorse.sentinel-list" . }} ]
+    SentinelMaster = "{{ template "gitlab.redis.host" $ }}"
+    Sentinel = [ {{ template "gitlab.redis.workhorse.sentinel-list" $ }} ]
     {{- end }}
-    {{- if .Values.global.redis.password.enabled }}
+    {{- if $.Values.global.redis.password.enabled }}
     Password = "<%= File.read("/etc/gitlab/redis/redis-password").strip.dump[1..-2] %>"
     {{- end }}
     {{- include "workhorse.object_storage.config" $ | nindent 4 }}
     [image_resizer]
-    max_scaler_procs = {{ .Values.workhorse.imageScaler.maxProcs | int }}
-    max_filesize = {{ .Values.workhorse.imageScaler.maxFileSizeBytes | int }}
+    max_scaler_procs = {{ $.Values.workhorse.imageScaler.maxProcs | int }}
+    max_filesize = {{ $.Values.workhorse.imageScaler.maxFileSizeBytes | int }}
   configure: |
       set -e
       mkdir -p /init-secrets-workhorse/gitlab-workhorse
       cp -v -r -L /init-config/gitlab-workhorse/secret /init-secrets-workhorse/gitlab-workhorse/secret
-      {{- if .Values.global.redis.password.enabled }}
+      {{- if $.Values.global.redis.password.enabled }}
       mkdir -p /init-secrets-workhorse/redis
       cp -v -r -L /init-config/redis/redis-password /init-secrets-workhorse/redis/
       {{- end }}
@@ -190,4 +199,5 @@ data:
       fi
       {{- end }}
 # Leave this here - This line denotes end of block to the parser.
+{{- end }}{{/* END range deployments */}}
 {{- end }}
diff --git a/charts/gitlab/charts/webservice/templates/deployment.yaml b/charts/gitlab/charts/webservice/templates/deployment.yaml
index 7b06ff2836..b02bb4fbf2 100644
--- a/charts/gitlab/charts/webservice/templates/deployment.yaml
+++ b/charts/gitlab/charts/webservice/templates/deployment.yaml
@@ -368,7 +368,7 @@ spec:
           name: {{ .fullname }}
       - name: workhorse-config
         configMap:
-            name: {{ $.Release.Name }}-workhorse-config
+            name: {{ $.Release.Name }}-workhorse-config-{{ .name }}
       - name: init-webservice-secrets
         projected:
           defaultMode: 0400
-- 
GitLab