feat(mediawiki): update elasticsearch configuration to support two cl…

…usters in parallel (#122) * feat(mediawiki): update elasticsearch configuration to support two clusters in parallel * fix: use correct default for existing cluster
wbstack · Jul 19, 2023 · 0857f67 · 0857f67
1 parent 0206d86
commit 0857f67
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 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.6
+version: 0.11.0
 home: https://github.com/wbstack
 maintainers:
   - name: WBstack

diff --git a/charts/mediawiki/templates/_helpers.tpl b/charts/mediawiki/templates/_helpers.tpl
@@ -66,10 +66,20 @@ Common deployment environment variables
       name: {{ .Values.mw.redis.passwordSecretName | quote }}
       key: {{ .Values.mw.redis.passwordSecretKey | quote }}
 {{- end }}
-- name: MW_ELASTICSEARCH_HOST
+- name: MW_DEFAULT_ELASTICSEARCH_HOST
   value: {{ .Values.mw.elasticsearch.host }}
-- name: MW_ELASTICSEARCH_PORT
+- name: MW_DEFAULT_ELASTICSEARCH_PORT
   value: {{ .Values.mw.elasticsearch.port | quote }}
+- name: MW_DEFAULT_ELASTICSEARCH_ES6
+  value: {{ .Values.mw.elasticsearch.es6 | quote }}
+{{- if .Values.mw.writeOnlyElasticsearch }}
+- name: MW_WRITE_ONLY_ELASTICSEARCH_HOST
+  value: {{ .Values.mw.writeOnlyElasticsearch.host | quote }}
+- name: MW_WRITE_ONLY_ELASTICSEARCH_PORT
+  value: {{ .Values.mw.writeOnlyElasticsearch.port | quote }}
+- name: MW_WRITE_ONLY_ELASTICSEARCH_ES5
+  value: {{ .Values.mw.writeOnlyElasticsearch.es6 | quote }}
+{{- end }}
 - name: MW_MAILGUN_DISABLED
 {{- if .Values.mw.mailgun.enabled }}
   value: "no"

diff --git a/charts/mediawiki/values.yaml b/charts/mediawiki/values.yaml
@@ -25,6 +25,7 @@ mw:
   elasticsearch:
     host: someOtherElasticsearchServer
     port: 9200
+    es6: true
   mail:
     domain: somedomain.name
   mailgun: