Skip to content

Commit c017be1

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

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,13 @@ spec:
5454
secretKeyRef:
5555
name: {{ .Values.backend.existingSecret }}
5656
key: {{ .Values.backend.existingMinioSecretKey | default "root-password" }}
57-
{{- else }}
57+
{{- else if (lookup "v1" "Secret" .Release.Namespace (printf "%s-secret" (include "clowder2.releaseName" .))) }}
5858
valueFrom:
5959
secretKeyRef:
6060
name: {{include "clowder2.releaseName" . }}-secret
6161
key: root-password
62+
{{- else }}
63+
value: {{ .Values.minio.auth.rootPassword }}
6264
{{- end }}
6365
- name: MINIO_UPLOAD_CHUNK_SIZE
6466
value: "10485760"

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,13 @@ spec:
3636
secretKeyRef:
3737
name: {{.Values.geoserver.existingSecret }}
3838
key: {{.Values.geoserver.existingGeoserverSecretKey | default "GEOSERVER_PW" }}
39-
{{- else }}
39+
{{- else if (lookup "v1" "Secret" .Release.Namespace (printf "%s-secret" (include "clowder2.releaseName" .))) }}
4040
valueFrom:
4141
secretKeyRef:
4242
name: {{include "clowder2.releaseName" . }}-secret
4343
key: GEOSERVER_PW
44+
{{- else }}
45+
value: {{ .Values.geoserver.password }}
4446
{{- end }}
4547
ports:
4648
- containerPort: 8080

deployments/kubernetes/charts/clowder2/templates/heartbeat/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.heartbeat.existingSecret }}
4545
key: {{.Values.heartbeat.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)