From 1647c54dac1a16853957a79796fcb82ec82b3bc2 Mon Sep 17 00:00:00 2001
From: Perside Rosalie <perside.rosalie@wikimedia.de>
Date: Tue, 11 Nov 2025 13:16:10 +0100
Subject: [PATCH 1/2] Mounting mediawiki configmap into the api deployment

---
 .../api/templates/deployment-app-backend.yaml   | 17 +++++++++++++++--
 charts/api/values.yaml                          |  4 ++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/charts/api/templates/deployment-app-backend.yaml b/charts/api/templates/deployment-app-backend.yaml
index c9412913..e19594ee 100644
--- a/charts/api/templates/deployment-app-backend.yaml
+++ b/charts/api/templates/deployment-app-backend.yaml
@@ -216,15 +216,28 @@ spec:
                 name: {{ template "api.fullname" . }}-app-passport-keys
                 {{- end }}
                 key: oauth-private.key
-      {{- if .Values.app.gce.serviceAccountSecret }}
           volumeMounts:
+            {{- if .values.app.gce.serviceAccountSecret }}
             - name: "service-account-wbstack-api"
               mountPath: "/var/run/secret/cloud.google.com"
+            {{- end }}
+
+            {{- if .Values.configMap.name }}
+            - name: mw-host-map
+              mountPath: {{ .Values.configMap.mountPath }}
+            {{- end }}
       volumes:
+        {{- if .values.app.gce.serviceAccountSecret }}
         - name: "service-account-wbstack-api"
           secret:
             secretName: {{ .Values.app.gce.serviceAccountSecret | quote }}
-      {{- end }}
+        {{- end }}
+
+        {{- if .Values.configMap.name }}
+        - name: mw-host-map
+          configMap:
+            name: {{ .Values.configMap.name }}
+        {{- end }}
 
       {{- with .Values.nodeSelector }}
       nodeSelector:
diff --git a/charts/api/values.yaml b/charts/api/values.yaml
index a01312f0..5fe77044 100644
--- a/charts/api/values.yaml
+++ b/charts/api/values.yaml
@@ -214,6 +214,10 @@ service:
 ingress:
   enabled: false
 
+configMap:
+  name: "mediawiki-host-map"
+  mountPath: "/config"
+
 resources:
   backend: {}
   web: {}

From 3eed186bdb50cc0e041e8b2651b07571067afbac Mon Sep 17 00:00:00 2001
From: Thomas Arrow <tarrow@users.noreply.github.com>
Date: Wed, 12 Nov 2025 11:56:40 +0000
Subject: [PATCH 2/2] Add ConfigMap for mediawiki service map

---
 charts/api/templates/configmap-mediawiki-service-map.yaml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 charts/api/templates/configmap-mediawiki-service-map.yaml

diff --git a/charts/api/templates/configmap-mediawiki-service-map.yaml b/charts/api/templates/configmap-mediawiki-service-map.yaml
new file mode 100644
index 00000000..a27e2ccf
--- /dev/null
+++ b/charts/api/templates/configmap-mediawiki-service-map.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: mediawiki-service-map
+data:
+  # some data