#8 (HELM) - allow for proxy app passwords to be from secrets

Signed-off-by: Lance-Drane <Lance-Drane@users.noreply.github.com>

Author: Lance-Drane

charts/proxy-http-client/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: proxy-http-client
 description: "Subscribe to events over HTTP from a proxy-http-server instance, and publish them on a local broker"
-version: 0.1.2
+version: 0.1.3
 dependencies:
   - name: common
     repository: oci://registry-1.docker.io/bitnamicharts

charts/proxy-http-client/templates/deployment.yaml

@@ -98,8 +98,8 @@ spec:
               {{- if .Values.app.broker.password.isSecret }}
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.app.broker.password.secretName }}
-                  key: {{ .Values.app.broker.password.secretKey }}
+                  name: {{ .Values.app.broker.password.secretName | quote }}
+                  key: {{ .Values.app.broker.password.secretKey | quote }}
               {{- else }}
               value: {{ .Values.app.broker.password.hardcoded | quote }}
               {{- end }}
@@ -114,7 +114,14 @@ spec:
             - name: PROXYAPP_OTHER_PROXY__USERNAME
               value: {{ .Values.app.other_proxy.username | quote }}
             - name: PROXYAPP_OTHER_PROXY__PASSWORD
-              value: {{ .Values.app.other_proxy.password | quote }}
+              {{- if .Values.app.other_proxy.password.isSecret }}
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.app.other_proxy.password.secretName | quote }}
+                  key: {{ .Values.app.other_proxy.password.secretKey | quote }}
+              {{- else }}
+              value: {{ .Values.app.other_proxy.password.hardcoded | quote }}
+              {{- end }}
             - name: PROXYAPP_TOPIC_PREFIX
               value: {{ required "app.topic_prefix not set (i.e. 'organization.facility.system.')" .Values.app.topic_prefix | quote }}
           envFrom:

charts/proxy-http-client/values.yaml

@@ -132,7 +132,12 @@ app:
   other_proxy:
     url: "" # this should not include the path
     username: "" # needed credential for clients calling HTTP endpoints other than /healthcheck
-    password: "" # needed credential for clients calling HTTP endpoints other than /healthcheck
+    # needed credential for clients calling HTTP endpoints other than /healthcheck
+    password:
+      isSecret: false
+      hardcoded: ""
+      secretName: ""
+      secretKey: ""
   broker:
     host: "127.0.0.1"
     port: "5672"

charts/proxy-http-server/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: proxy-http-server
 description: "Subscribe to broker messages and broadcast them to HTTP listeners"
-version: 0.1.2
+version: 0.1.3
 dependencies:
   - name: common
     repository: oci://registry-1.docker.io/bitnamicharts

charts/proxy-http-server/templates/deployment.yaml

@@ -101,8 +101,8 @@ spec:
               {{- if .Values.app.broker.password.isSecret }}
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.app.broker.password.secretName }}
-                  key: {{ .Values.app.broker.password.secretKey }}
+                  name: {{ .Values.app.broker.password.secretName | quote }}
+                  key: {{ .Values.app.broker.password.secretKey | quote }}
               {{- else }}
               value: {{ .Values.app.broker.password.hardcoded | quote }}
               {{- end }}
@@ -119,7 +119,14 @@ spec:
             - name: PROXYAPP_USERNAME
               value: {{ .Values.app.username | quote }}
             - name: PROXYAPP_PASSWORD
-              value: {{ .Values.app.password | quote }}
+              {{- if .Values.app.password.isSecret }}
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.app.password.secretName | quote }}
+                  key: {{ .Values.app.password.secretKey | quote }}
+              {{- else }}
+              value: {{ .Values.app.password.hardcoded | quote }}
+              {{- end }}
           envFrom:
             {{- if .Values.extraEnvVarsCM }}
             - configMapRef:

charts/proxy-http-server/values.yaml

@@ -162,7 +162,12 @@ app:
   log_level: "info"
   topic_prefix: "" # i.e. "organization.facility.system.", you should consciously set this value.
   username: "" # needed credential for clients calling HTTP endpoints other than /healthcheck
-  password: "" # needed credential for clients calling HTTP endpoints other than /healthcheck
+  # needed credential for clients calling HTTP endpoints other than /healthcheck
+  password:
+    isSecret: false
+    hardcoded: ""
+    secretName: ""
+    secretKey: ""
   broker:
     host: "127.0.0.1"
     port: "5672"