add missing values to cannon and background-worker, remove additional…

… logs
wireapp · Jan 22, 2025 · 2662436 · 2662436
1 parent 4812509
commit 2662436
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/bin/offline-helm.sh b/bin/offline-helm.sh
@@ -11,11 +11,8 @@ helm upgrade --install --wait demo-smtp ./charts/demo-smtp --values ./values/dem
 helm upgrade --install --wait rabbitmq ./charts/rabbitmq --values ./values/rabbitmq/prod-values.example.yaml --values ./values/rabbitmq/prod-secrets.example.yaml
 helm upgrade --install --wait databases-ephemeral ./charts/databases-ephemeral --values ./values/databases-ephemeral/prod-values.example.yaml
 helm upgrade --install --wait reaper ./charts/reaper
-helm upgrade --install --timeout=30m0s wire-server ./charts/wire-server --values ./values/wire-server/prod-values.example.yaml --values ./values/wire-server/secrets.yaml
-sleep 15m
-kubectl get pods --all-namespaces -o wide
-sleep 15m
-kubectl get pods --all-namespaces -o wide
+helm upgrade --install --wait --timeout=30m0s wire-server ./charts/wire-server --values ./values/wire-server/prod-values.example.yaml --values ./values/wire-server/secrets.yaml
+
 # if charts/webapp directory exists
 if [ -d "./charts/webapp" ]; then
     helm upgrade --install --wait --timeout=15m0s webapp ./charts/webapp --values ./values/webapp/prod-values.example.yaml

diff --git a/values/wire-server/prod-values.example.yaml b/values/wire-server/prod-values.example.yaml
@@ -117,6 +117,9 @@ cannon:
 #    tag: some-tag (only override if you want a newer/different version than what is in the chart)
   # For demo mode only, we don't need to keep websocket connections open on chart upgrades
   drainTimeout: 10
+  config:
+    cassandra: 
+      host: cassandra-external
 
 cargohold:
   replicaCount: 3
@@ -259,4 +262,7 @@ federator:
 
 background-worker:
   config:
+    cassandra:
+      host: cassandra-external
+    # Enable for federation
     enableFederation: false