fix secrets

Author: robkooper

Chart.yaml

@@ -13,7 +13,7 @@ description: >
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.15.2
+version: 0.15.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -55,5 +55,4 @@ annotations:
     - name: Helm Chart
       url: https://github.com/clowder-framework/clowder-helm
   artifacthub.io/changes: |
-    - update clowder to 1.20.3
-    - update image previewer to 2.4.0
+    - fix secrets when using release name

README.md

@@ -167,6 +167,9 @@ extraConfig:
 
 ## ChangeLog
 
+### 0.15.2
+- fix deployment when using release name and secrets
+
 ### 0.15.2
 - update clowder to [1.20.3](https://github.com/clowder-framework/clowder/releases/tag/v1.20.3)
 - update image previewer to 2.4.0

templates/deployment.yaml

@@ -33,7 +33,7 @@ spec:
             - name: MONGO_URI
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Release.Name }}
+                  name: {{ include "clowder.fullname" . }}
                   key: mongodb-uri
 {{- if not (or .Values.storage.s3 .Values.minio.enabled) }}
         - name: chown-data-folder
@@ -73,23 +73,23 @@ spec:
             - name: CLOWDER_KEY
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Release.Name }}
+                  name: {{ include "clowder.fullname" . }}
                   key: clowder-key
             - name: CLOWDER_SECRET
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Release.Name }}
+                  name: {{ include "clowder.fullname" . }}
                   key: clowder-secret
 {{- if .Values.storage.s3 }}
             - name: S3_ACCESSKEY
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Release.Name }}
+                  name: {{ include "clowder.fullname" . }}
                   key: s3-access-key
             - name: S3_SECRETKEY
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Release.Name }}
+                  name: {{ include "clowder.fullname" . }}
                   key: s3-secret-key
 {{- else if .Values.minio.enabled }}
             - name: S3_ACCESSKEY
@@ -106,12 +106,12 @@ spec:
             - name: RABBITMQ_URI
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Release.Name }}
+                  name: {{ include "clowder.fullname" . }}
                   key: rabbitmq-uri
             - name: MONGODB_URI
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Release.Name }}
+                  name: {{ include "clowder.fullname" . }}
                   key: mongodb-uri
           volumeMounts:
             - name: custom-volume

templates/extractors/clowder.yaml

@@ -36,7 +36,7 @@ spec:
             - name: RABBITMQ_URI
               valueFrom:
                 secretKeyRef:
-                  name: {{ $.Release.Name }}
+                  name: {{ include "clowder.fullname" . }}
                   key: rabbitmq-uri
       containers:
         - name: extractor
@@ -46,7 +46,7 @@ spec:
             - name: RABBITMQ_URI
               valueFrom:
                 secretKeyRef:
-                  name: {{ $.Release.Name }}
+                  name: {{ include "clowder.fullname" . }}
                   key: rabbitmq-uri
 {{- if .env }}
             {{- toYaml .env | nindent 12 }}

templates/monitor/deployment.yaml

@@ -29,7 +29,7 @@ spec:
             - name: RABBITMQ_URI
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Release.Name }}
+                  name: {{ include "clowder.fullname" . }}
                   key: rabbitmq-uri
       containers:
         - name: {{ .Chart.Name }}
@@ -43,12 +43,12 @@ spec:
             - name: RABBITMQ_URI
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Release.Name }}
+                  name: {{ include "clowder.fullname" . }}
                   key: rabbitmq-uri
             - name: CLOWDER_SECRET
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Release.Name }}
+                  name: {{ include "clowder.fullname" . }}
                   key: clowder-secret
           livenessProbe:
             tcpSocket: