Merge pull request #285 from akash4sh/main

config: Add env for postgres username and password
kube-tarian · Jun 19, 2024 · b6c6d43 · b6c6d43
2 parents f44cb94 + 14fff03
commit b6c6d43
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml
@@ -22,7 +22,7 @@ name: grafana
 sources:
 - https://github.com/grafana/grafana
 type: application
-version: 1.0.7
+version: 1.0.8
 dependencies:
   - name: postgresql
     condition: postgresql.enabled

diff --git a/charts/grafana/templates/_pod.tpl b/charts/grafana/templates/_pod.tpl
@@ -538,6 +538,19 @@ containers:
             key: {{ .Values.Clickhouse.existingSecret.passwordkey }}
         {{- end }}
       {{- end }}
+      {{- if .Values.postgresql.enabled }}
+      - name: POSTGRESQL_USERNAME
+        value: {{ .Values.postgresql.username }}
+      - name: POSTGRESQL_PASSWORD
+        {{- if not .Values.postgresql.existingSecret }}
+        value: {{ .Values.postgresql.password }}
+        {{- else }}
+        valueFrom:
+          secretKeyRef:
+            name: {{ .Values.postgresql.existingSecret.name }}
+            key: {{ .Values.postgresql.existingSecret.passwordkey }}
+        {{- end }}
+      {{- end }}
       {{- if .Values.imageRenderer.enabled }}
       - name: GF_RENDERING_SERVER_URL
         value: http://{{ template "grafana.fullname" . }}-image-renderer.{{ template "grafana.namespace" . }}:{{ .Values.imageRenderer.service.port }}/render

diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml
@@ -929,3 +929,11 @@ Clickhouse:
     # name: ""
     # usernamekey: ""
     # passwordkey: ""
+
+postgresql:
+  enabled: false
+  username: ""
+  password: ""
+  existingSecret: {}
+    # name: ""
+    # passwordkey: ""