Don't manage the k8s secret for prometheus auth from this chart

Author: GeorgianaElena

helm/jupyterhub-cost-monitoring/templates/deployment.yaml

@@ -34,16 +34,18 @@ spec:
             {{- with .Values.extraEnv }}
             {{- tpl (. | toYaml) $ | nindent 12 }}
             {{- end }}
+            {{- if .Values.prometheusAuth.enabled }}
             - name: PROMETHEUS_USERNAME
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "jupyterhub-cost-monitoring.webserver.fullname" . }}
+                  name: {{ .Values.prometheusAuth.envFromSecret }}
                   key: username
             - name: PROMETHEUS_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "jupyterhub-cost-monitoring.webserver.fullname" . }}
+                  name: {{ .Values.prometheusAuth.envFromSecret }}
                   key: password
+            {{- end }}
           resources:
             {{- .Values.resources | toYaml | nindent 12 }}
           securityContext:

helm/jupyterhub-cost-monitoring/templates/secret.yaml

@@ -172,8 +172,16 @@ prometheusAuth:
   properties:
     enabled:
       type: boolean
-    username:
+    envFromSecret:
       type: string
-    password:
-      type: string
-  required: [enabled]
+  required: [enabled]
+  # If enabled, then make envFromSecret mandatory
+  anyOf:
+  - properties:
+      enabled:
+        const: true
+    required:
+      - envFromSecret
+  - properties:
+      enabled:
+        const: false

helm/jupyterhub-cost-monitoring/values.schema.yaml

@@ -75,5 +75,4 @@ networkPolicy:
 #
 prometheusAuth:
   enabled: false
-  username: ""
-  password: ""
+  envFromSecret: ""