Skip to content

[charts] Fix staging configuration #4338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elland merged 3 commits into from
Nov 13, 2024
Merged

[charts] Fix staging configuration #4338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b675078
charts: Brig rabbitmq config was inside federation block.
elland Nov 13, 2024
62da71e
charts: Added cassandra config to bg-worker deployment.
elland Nov 13, 2024
9db9b04
changelog: Updated info to explain this is a breaking change on charts.
elland Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion changelog.d/0-release-notes/WBP-10308
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
9 changes: 9 additions & 0 deletions charts/background-worker/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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/"
Expand Down
2 changes: 1 addition & 1 deletion charts/brig/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ data:
federatorInternal:
host: federator
port: 8080
{{- end }}

{{- with .rabbitmq }}
rabbitmq:
Expand All @@ -92,7 +93,6 @@ data:
caCert: /etc/wire/brig/rabbitmq-ca/{{ .tlsCaSecretRef.key }}
{{- end }}
{{- end }}
{{- end }}
Copy link
Contributor Author

@elland elland Nov 13, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rabbitmq was declared inside of '{{- if .enableFederation }}. Moved the closing {{- end }}` up to federator only.


{{- with .aws }}
aws:
Expand Down