[helm-charts] Allow filtering cassandra nodes by datacenter (#2273)

Co-authored-by: jschaul <[email protected]>
wireapp · Apr 11, 2022 · 9ba1c3b · 9ba1c3b
1 parent cefdda9
commit 9ba1c3b
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 11 deletions.
diff --git a/changelog.d/2-features/helm-allow-filter-cass-dc b/changelog.d/2-features/helm-allow-filter-cass-dc
@@ -0,0 +1 @@
+[helm-charts] Allow filtering cassandra nodes by datacenter
diff --git a/charts/brig/templates/configmap.yaml b/charts/brig/templates/configmap.yaml
@@ -26,6 +26,9 @@ data:
         host: {{ .cassandra.host }}
         port: 9042
       keyspace: brig
+      {{- if hasKey .cassandra "filterNodesByDatacentre" }}
+      filterNodesByDatacentre: {{ .cassandra.filterNodesByDatacentre }}
+      {{- end }}
 
     elasticsearch:
       url: http://{{ .elasticsearch.host }}:{{ .elasticsearch.port }}

diff --git a/charts/galley/templates/configmap.yaml b/charts/galley/templates/configmap.yaml
@@ -19,6 +19,9 @@ data:
         host: {{ .cassandra.host }}
         port: 9042
       keyspace: galley
+      {{- if hasKey .cassandra "filterNodesByDatacentre" }}
+      filterNodesByDatacentre: {{ .cassandra.filterNodesByDatacentre }}
+      {{- end }}
 
     brig:
       host: brig

diff --git a/charts/gundeck/templates/configmap.yaml b/charts/gundeck/templates/configmap.yaml
@@ -17,6 +17,9 @@ data:
         host: {{ .cassandra.host }}
         port: 9042
       keyspace: gundeck
+      {{- if hasKey .cassandra "filterNodesByDatacentre" }}
+      filterNodesByDatacentre: {{ .cassandra.filterNodesByDatacentre }}
+      {{- end }}
 
     redis:
       host: {{ .redis.host }}

diff --git a/charts/spar/templates/configmap.yaml b/charts/spar/templates/configmap.yaml
@@ -3,9 +3,10 @@ kind: ConfigMap
 metadata:
   name: "spar"
 data:
+{{- with .Values.config }}
   spar.yaml: |
     logNetStrings: True # log using netstrings encoding (see http://cr.yp.to/proto/netstrings.txt)
-    logLevel: {{ .Values.config.logLevel }}
+    logLevel: {{ .logLevel }}
 
     brig:
       host: brig
@@ -17,25 +18,29 @@ data:
 
     cassandra:
       endpoint:
-        host: {{ .Values.config.cassandra.host }}
+        host: {{ .cassandra.host }}
         port: 9042
       keyspace: spar
+      {{- if hasKey .cassandra "filterNodesByDatacentre" }}
+      filterNodesByDatacentre: {{ .cassandra.filterNodesByDatacentre }}
+      {{- end }}
 
-    maxttlAuthreq: {{ .Values.config.maxttlAuthreq }}
-    maxttlAuthresp: {{ .Values.config.maxttlAuthresp }}
+    maxttlAuthreq: {{ .maxttlAuthreq }}
+    maxttlAuthresp: {{ .maxttlAuthresp }}
 
-    richInfoLimit: {{ .Values.config.richInfoLimit }}
+    richInfoLimit: {{ .richInfoLimit }}
 
-    maxScimTokens: {{ .Values.config.maxScimTokens }}
+    maxScimTokens: {{ .maxScimTokens }}
 
     saml:
       version:     SAML2.0
-      logLevel:    {{ .Values.config.logLevel }}
+      logLevel:    {{ .logLevel }}
 
       spHost: 0.0.0.0
-      spPort: {{ .Values.service.externalPort }}
-      spAppUri: {{ .Values.config.appUri }}
-      spSsoUri: {{ .Values.config.ssoUri }}
+      spPort: {{ $.Values.service.externalPort }}
+      spAppUri: {{ .appUri }}
+      spSsoUri: {{ .ssoUri }}
 
       contacts:
-{{ toYaml .Values.config.contacts | indent 12 }}
+{{ toYaml .contacts | indent 12 }}
+{{- end }}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		[helm-charts] Allow filtering cassandra nodes by datacenter