gundeck: fix copy-paste error in wire-server helm vars

wireapp · Nov 4, 2024 · 2f0d7e3 · 2f0d7e3
1 parent 73e5624
commit 2f0d7e3
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 11 deletions.
diff --git a/charts/gundeck/templates/configmap.yaml b/charts/gundeck/templates/configmap.yaml
@@ -29,16 +29,17 @@ data:
       tlsCa: /etc/wire/gundeck/cassandra/{{- (include "tlsSecretRef" . | fromYaml).key }}
       {{- end }}
 
+    {{- with .rabbitmq }}
     rabbitmq:
-      host: rabbitmq
-      port: 5672
-      vHost: /
-      adminPort: 15672
-      enableTls: false
-      insecureSkipVerifyTls: false
-      # tlsCaSecretRef:
-      #   name: <secret-name>
-      #   key: <ca-attribute>
+      host: {{ .host }}
+      port: {{ .port }}
+      vHost: {{ .vHost }}
+      enableTls: {{ .enableTls }}
+      insecureSkipVerifyTls: {{ .insecureSkipVerifyTls }}
+      {{- if .tlsCaSecretRef }}
+      caCert: /etc/wire/gundeck/rabbitmq-ca/{{ .tlsCaSecretRef.key }}
+      {{- end }}
+    {{- end }}
 
     redis:
       host: {{ .redis.host }}

diff --git a/charts/gundeck/templates/deployment.yaml b/charts/gundeck/templates/deployment.yaml
@@ -39,6 +39,11 @@ spec:
         - name: "gundeck-config"
           configMap:
             name: "gundeck"
+        {{- if .Values.config.rabbitmq.tlsCaSecretRef }}
+        - name: "rabbitmq-ca"
+          secret:
+            secretName: {{ .Values.config.rabbitmq.tlsCaSecretRef.name }}
+        {{- end }}
         {{- if eq (include "useCassandraTLS" .Values.config) "true" }}
         - name: "gundeck-cassandra"
           secret:
@@ -77,16 +82,20 @@ spec:
           - name: "additional-redis-ca"
             mountPath: "/etc/wire/gundeck/additional-redis-ca/"
           {{- end }}
+          {{- if .Values.config.rabbitmq.tlsCaSecretRef }}
+          - name: "rabbitmq-ca"
+            mountPath: "/etc/wire/gundeck/rabbitmq-ca/"
+          {{- end }}
           env:
           - name: RABBITMQ_USERNAME
             valueFrom:
               secretKeyRef:
-                name: gundeck-worker
+                name: gundeck
                 key: rabbitmqUsername
           - name: RABBITMQ_PASSWORD
             valueFrom:
               secretKeyRef:
-                name: gundeck-worker
+                name: gundeck
                 key: rabbitmqPassword
           {{- if hasKey .Values.secrets "awsKeyId" }}
           - name: AWS_ACCESS_KEY_ID

diff --git a/charts/gundeck/templates/secret.yaml b/charts/gundeck/templates/secret.yaml
@@ -11,6 +11,8 @@ metadata:
 type: Opaque
 data:
   {{- with .Values.secrets }}
+  rabbitmqUsername: {{ .rabbitmq.username | b64enc | quote }}
+  rabbitmqPassword: {{ .rabbitmq.password | b64enc | quote }}
   {{- if hasKey . "awsKeyId" }}
   awsKeyId: {{ .awsKeyId | b64enc | quote }}
   {{- end }}

diff --git a/charts/gundeck/values.yaml b/charts/gundeck/values.yaml
@@ -21,6 +21,7 @@ config:
   rabbitmq:
     host: rabbitmq
     port: 5672
+    adminPort: 15672
     vHost: /
     enableTls: false
     insecureSkipVerifyTls: false

diff --git a/hack/helm_vars/wire-server/values.yaml.gotmpl b/hack/helm_vars/wire-server/values.yaml.gotmpl
@@ -210,6 +210,7 @@ cannon:
     disabledAPIVersions: []
     rabbitmq:
       port: 5671
+      adminPort: 15671
       enableTls: true
       insecureSkipVerifyTls: false
       tlsCaSecretRef: