From c75ea07bc90e5ce2f4b047e260a555885b7f1851 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] Add mediawiki configmap into the api deployment

---
 .../api/templates/deployment-app-backend.yaml   | 17 +++++++++++++++--
 charts/api/templates/mediawiki-configmap.yaml   |  6 ++++++
 charts/api/values.yaml                          |  9 +++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 charts/api/templates/mediawiki-configmap.yaml

diff --git a/charts/api/templates/deployment-app-backend.yaml b/charts/api/templates/deployment-app-backend.yaml
index c9412913..212855a6 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: "mediawiki-configMap"
+              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: "mediawiki-configMap"
+          configMap:
+            name: {{ .Values.configMap.name }}
+        {{- end }}
 
       {{- with .Values.nodeSelector }}
       nodeSelector:
diff --git a/charts/api/templates/mediawiki-configmap.yaml b/charts/api/templates/mediawiki-configmap.yaml
new file mode 100644
index 00000000..77357f78
--- /dev/null
+++ b/charts/api/templates/mediawiki-configmap.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: mediawiki-host-map
+data:
+    {{- .Values.configMap.jsonMap | toYaml | nindent 2 }}
\ No newline at end of file
diff --git a/charts/api/values.yaml b/charts/api/values.yaml
index a01312f0..281b4079 100644
--- a/charts/api/values.yaml
+++ b/charts/api/values.yaml
@@ -214,6 +214,15 @@ service:
 ingress:
   enabled: false
 
+configMap:
+  name: "mediawiki-host-map"
+  mountPath: "/config"
+  jsonMap: |
+    {
+      "mw1.39-wbs1": "139-app",
+      "mw1.43-wbs1": "143-app"
+    }
+
 resources:
   backend: {}
   web: {}

From 61f19d9ff5a52233af941a5d99aea792e634ed38 Mon Sep 17 00:00:00 2001
From: Perside Rosalie <perside.rosalie@wikimedia.de>
Date: Thu, 13 Nov 2025 13:54:54 +0100
Subject: [PATCH 2/2] some refactoring

---
 charts/api/Chart.yaml                            |  2 +-
 charts/api/templates/deployment-app-backend.yaml |  8 ++------
 charts/api/templates/mediawiki-configmap.yaml    |  4 ++--
 charts/api/values.yaml                           | 11 +++--------
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/charts/api/Chart.yaml b/charts/api/Chart.yaml
index c6e253f3..bcc0ab42 100644
--- a/charts/api/Chart.yaml
+++ b/charts/api/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.0"
 description: A Helm chart for the WBStack API
 name: api
-version: 0.33.0
+version: 0.33.1
 home: https://github.com/wbstack
 maintainers:
   - name: WBstack
diff --git a/charts/api/templates/deployment-app-backend.yaml b/charts/api/templates/deployment-app-backend.yaml
index 212855a6..13265a91 100644
--- a/charts/api/templates/deployment-app-backend.yaml
+++ b/charts/api/templates/deployment-app-backend.yaml
@@ -222,10 +222,8 @@ spec:
               mountPath: "/var/run/secret/cloud.google.com"
             {{- end }}
 
-            {{- if .Values.configMap.name }}
             - name: "mediawiki-configMap"
-              mountPath: {{ .Values.configMap.mountPath }}
-            {{- end }}
+              mountPath: "/config"
       volumes:
         {{- if .values.app.gce.serviceAccountSecret }}
         - name: "service-account-wbstack-api"
@@ -233,11 +231,9 @@ spec:
             secretName: {{ .Values.app.gce.serviceAccountSecret | quote }}
         {{- end }}
 
-        {{- if .Values.configMap.name }}
         - name: "mediawiki-configMap"
           configMap:
-            name: {{ .Values.configMap.name }}
-        {{- end }}
+            name: "mediawiki-version-map"
 
       {{- with .Values.nodeSelector }}
       nodeSelector:
diff --git a/charts/api/templates/mediawiki-configmap.yaml b/charts/api/templates/mediawiki-configmap.yaml
index 77357f78..b09f08ab 100644
--- a/charts/api/templates/mediawiki-configmap.yaml
+++ b/charts/api/templates/mediawiki-configmap.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: mediawiki-host-map
+  name: mediawiki-version-map
 data:
-    {{- .Values.configMap.jsonMap | toYaml | nindent 2 }}
\ No newline at end of file
+    {{- .Values.mediawikiVersionConfigMap | toYaml | nindent 2 }}
\ No newline at end of file
diff --git a/charts/api/values.yaml b/charts/api/values.yaml
index 281b4079..9133d965 100644
--- a/charts/api/values.yaml
+++ b/charts/api/values.yaml
@@ -214,14 +214,9 @@ service:
 ingress:
   enabled: false
 
-configMap:
-  name: "mediawiki-host-map"
-  mountPath: "/config"
-  jsonMap: |
-    {
-      "mw1.39-wbs1": "139-app",
-      "mw1.43-wbs1": "143-app"
-    }
+mediawikiVersionConfigMap: |
+    mw1.39-wbs1: 139-app
+    mw1.43-wbs1: 143-app
 
 resources:
   backend: {}