Merge pull request #287 from akash4sh/main

config: modify postgresql to postgresDatasource in values.yaml
kube-tarian · Jun 19, 2024 · fc2d148 · fc2d148
2 parents b6c6d43 + 7449cf1
commit fc2d148
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
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.8
+version: 1.0.9
 dependencies:
   - name: postgresql
     condition: postgresql.enabled

diff --git a/charts/grafana/templates/_pod.tpl b/charts/grafana/templates/_pod.tpl
@@ -538,17 +538,17 @@ containers:
             key: {{ .Values.Clickhouse.existingSecret.passwordkey }}
         {{- end }}
       {{- end }}
-      {{- if .Values.postgresql.enabled }}
+      {{- if .Values.postgresDatasource.enabled }}
       - name: POSTGRESQL_USERNAME
-        value: {{ .Values.postgresql.username }}
+        value: {{ .Values.postgresDatasource.username }}
       - name: POSTGRESQL_PASSWORD
-        {{- if not .Values.postgresql.existingSecret }}
-        value: {{ .Values.postgresql.password }}
+        {{- if not .Values.postgresDatasource.existingSecret }}
+        value: {{ .Values.postgresDatasource.password }}
         {{- else }}
         valueFrom:
           secretKeyRef:
-            name: {{ .Values.postgresql.existingSecret.name }}
-            key: {{ .Values.postgresql.existingSecret.passwordkey }}
+            name: {{ .Values.postgresDatasource.existingSecret.name }}
+            key: {{ .Values.postgresDatasource.existingSecret.passwordkey }}
         {{- end }}
       {{- end }}
       {{- if .Values.imageRenderer.enabled }}

diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml
@@ -930,7 +930,7 @@ Clickhouse:
     # usernamekey: ""
     # passwordkey: ""
 
-postgresql:
+postgresDatasource:
   enabled: false
   username: ""
   password: ""