mediawiki 0.10.6 (#99)

* bump mediawiki chart to 0.10.6 * Add new mw tag placeholder * switch image tag to 1.37-7.4-20220621-fp-beta-0 * Update Readme * Fix templating * Update charts/mediawiki/templates/_helpers.tpl Co-authored-by: Tobias <tobias.andersson@wikimedia.de> Co-authored-by: Tobias <tobias.andersson@wikimedia.de>
wbstack · Jun 21, 2022 · 4e95abc · 4e95abc
1 parent e1a5b9c
commit 4e95abc
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/charts/mediawiki/Chart.yaml b/charts/mediawiki/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.37"
 description: A Helm wbstack flavoured MediaWiki
 name: mediawiki
-version: 0.10.5
+version: 0.10.6
 home: https://github.com/wbstack
 maintainers:
   - name: WBstack

diff --git a/charts/mediawiki/README.md b/charts/mediawiki/README.md
@@ -1,7 +1,17 @@
 # wbstack mediawiki
 
+## Settings
+### mw.settings.allowedProxyCidr 
+Sets `$wgCdnServersNoPurge` in mediawiki.
+
+In order to see which IP ranges is used for a GKE cluster you can run the following command:
+```
+kubectl get ds kube-proxy -n kube-system -o=jsonpath="{.spec.template.spec.containers[0].command}" | grep -Po '\-\-cluster\-cidr=[^ ]*' | cut -d'=' -f2 | tr -d '"]'
+```
+
 ## Changelog
 
+- 0.10.6: Added `mw.settings.allowedProxyCidr` to set $wgCdnServersNoPurge
 - 0.10.5: New MW release with updated CirrusSearch sharding config, we missed one index.
 - 0.10.4: New MW release with CirrusSearch sharding config
 - 0.10.3: Bump version number to trigger new chart release

diff --git a/charts/mediawiki/templates/_helpers.tpl b/charts/mediawiki/templates/_helpers.tpl
@@ -157,6 +157,11 @@ Common deployment environment variables
 
 {{- end -}}
 
+{{- if .Values.mw.settings.allowedProxyCidr }}
+- name: MW_ALLOWED_PROXY_CIDR
+  value: {{ .Values.mw.settings.allowedProxyCidr | quote }}
+{{- end -}}
+
 {{- end -}}
 
 {{/*

diff --git a/charts/mediawiki/values.yaml b/charts/mediawiki/values.yaml
@@ -6,12 +6,13 @@ replicaCount:
 
 image:
   repository: ghcr.io/wbstack/mediawiki
-  tag: "1.37-7.4-20220513-fp-beta-0"
+  tag: "1.37-7.4-20220621-fp-beta-0"
   pullPolicy: IfNotPresent
 
 mw:
   settings:
     logToStdErr: false
+    allowedProxyCidr: ""
   db:
     master: someHostName
     replica: someHostName