Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions helm/jupyterhub-cost-monitoring/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
9 changes: 0 additions & 9 deletions helm/jupyterhub-cost-monitoring/templates/secret.yaml

This file was deleted.

16 changes: 12 additions & 4 deletions helm/jupyterhub-cost-monitoring/values.schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 1 addition & 2 deletions helm/jupyterhub-cost-monitoring/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,4 @@ networkPolicy:
#
prometheusAuth:
enabled: false
username: ""
password: ""
envFromSecret: ""
Loading