From 7f426d60e11fd387e35695d100f1becacf949a56 Mon Sep 17 00:00:00 2001
From: Igor Ranieri <54423+elland@users.noreply.github.com>
Date: Wed, 13 Nov 2024 11:23:11 +0100
Subject: [PATCH] [charts] Fix staging configuration (#4338)

* charts: Brig rabbitmq config was inside federation block.

* charts: Added cassandra config to bg-worker deployment.

* changelog: Updated info to explain this is a breaking change on charts.
---
 changelog.d/0-release-notes/WBP-10308              | 6 +++++-
 charts/background-worker/templates/deployment.yaml | 9 +++++++++
 charts/brig/templates/configmap.yaml               | 2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/changelog.d/0-release-notes/WBP-10308 b/changelog.d/0-release-notes/WBP-10308
index 0484164f8ca..a545a94aca0 100644
--- a/changelog.d/0-release-notes/WBP-10308
+++ b/changelog.d/0-release-notes/WBP-10308
@@ -1 +1,5 @@
-Notifications are now also sent via RabbitMQ. Therefore, if federation is enabled, RabbitMQ is a required configuration in Brig.
+Notifications are now sent via RabbitMQ. Therefore RabbitMQ is now a required dependency for Cannon and Gundeck.
+Cassandra is now a required dependency for Cannon and Background-Worker.
+Both of them need access to the Gundeck keyspace.
+Brig also needs RabbitMQ configured, before this was contingent on Federation being enabled.
+These are breaking changes for Charts.
diff --git a/charts/background-worker/templates/deployment.yaml b/charts/background-worker/templates/deployment.yaml
index bbc0b6f71f4..3ee60e4b89a 100644
--- a/charts/background-worker/templates/deployment.yaml
+++ b/charts/background-worker/templates/deployment.yaml
@@ -36,6 +36,11 @@ spec:
         - name: "background-worker-secrets"
           secret:
             secretName: "background-worker"
+        {{- if eq (include "useCassandraTLS" .Values.config) "true" }}
+        - name: "background-worker-cassandra"
+          secret:
+            secretName: {{ (include "tlsSecretRef" .Values.config | fromYaml).name }}
+        {{- end }}
         {{- if .Values.config.rabbitmq.tlsCaSecretRef }}
         - name: "rabbitmq-ca"
           secret:
@@ -52,6 +57,10 @@ spec:
           volumeMounts:
           - name: "background-worker-config"
             mountPath: "/etc/wire/background-worker/conf"
+          {{- if eq (include "useCassandraTLS" .Values.config) "true" }}
+          - name: "background-worker-cassandra"
+            mountPath: "/etc/wire/background-worker/cassandra"
+          {{- end }}
           {{- if .Values.config.rabbitmq.tlsCaSecretRef }}
           - name: "rabbitmq-ca"
             mountPath: "/etc/wire/background-worker/rabbitmq-ca/"
diff --git a/charts/brig/templates/configmap.yaml b/charts/brig/templates/configmap.yaml
index 7c732c7b590..d602d049d13 100644
--- a/charts/brig/templates/configmap.yaml
+++ b/charts/brig/templates/configmap.yaml
@@ -80,6 +80,7 @@ data:
     federatorInternal:
       host: federator
       port: 8080
+    {{- end }}
 
     {{- with .rabbitmq }}
     rabbitmq:
@@ -92,7 +93,6 @@ data:
       caCert: /etc/wire/brig/rabbitmq-ca/{{ .tlsCaSecretRef.key }}
       {{- end }}
     {{- end }}
-    {{- end }}
 
     {{- with .aws }}
     aws: