Skip to content

Commit 96c2af6

Browse files
committed
Updated templates to check that secret exists
1 parent c017be1 commit 96c2af6

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

deployments/kubernetes/charts/clowder2/templates/backend/deployment.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,13 @@ spec:
106106
secretKeyRef:
107107
name: {{ .Values.backend.existingSecret }}
108108
key: {{ .Values.backend.existingRabbitMQSecretKey | default "rabbitmq-password" }}
109-
{{- else }}
109+
{{- else if (lookup "v1" "Secret" .Release.Namespace (printf "%s-secret" (include "clowder2.releaseName" .))) }}
110110
valueFrom:
111111
secretKeyRef:
112112
name: {{ include "clowder2.releaseName" . }}-secret
113113
key: rabbitmq-password
114+
{{- else }}
115+
value: {{ .Values.rabbitmq.auth.password }}
114116
{{- end }}
115117
- name: RABBITMQ_HOST
116118
value: {{ include "clowder2.releaseName" . }}-rabbitmq

deployments/kubernetes/charts/clowder2/templates/messages/deployment.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,13 @@ spec:
4343
secretKeyRef:
4444
name: {{ .Values.message.existingSecret }}
4545
key: {{ .Values.message.existingRabbitMQSecretKey | default "rabbitmq-password" }}
46-
{{- else }}
46+
{{- else if (lookup "v1" "Secret" .Release.Namespace (printf "%s-secret" (include "clowder2.releaseName" .))) }}
4747
valueFrom:
4848
secretKeyRef:
4949
name: {{ include "clowder2.releaseName" . }}-secret
5050
key: rabbitmq-password
51+
{{- else }}
52+
value: {{ .Values.rabbitmq.auth.password }}
5153
{{- end }}
5254
- name: RABBITMQ_HOST
5355
value: {{ include "clowder2.releaseName" . }}-rabbitmq

0 commit comments

Comments
 (0)