Merge pull request #217 from akash4sh/main

feat: Add existing secret support for db password
kube-tarian · Apr 27, 2024 · 04fe182 · 04fe182
2 parents 5f88e08 + 24c979d
commit 04fe182
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/charts/clickhouse/Chart.yaml b/charts/clickhouse/Chart.yaml
@@ -22,4 +22,4 @@ sources:
 - https://github.com/signoz/charts/
 - https://github.com/ClickHouse/ClickHouse
 type: application
-version: 1.0.2
+version: 1.0.3
diff --git a/charts/clickhouse/templates/clickhouse-instance/clickhouse-instance.yaml b/charts/clickhouse/templates/clickhouse-instance/clickhouse-instance.yaml
@@ -16,13 +16,23 @@ spec:
 
   configuration:
     users:
+    {{- if .Values.existingSecret }}
+      {{ .Values.user }}/k8s_secret_password: {{ .Values.existingSecret.name }}/{{ .Values.existingSecret.passwordkey }}
+      {{ .Values.user }}/networks/ip:
+        {{- range $.Values.allowedNetworkIps }}
+        - {{ . | quote }}
+        {{- end }}
+      {{ .Values.user }}/profile: default
+      {{ .Values.user }}/quota: default
+    {{- else }}
       {{ .Values.user }}/password: {{ .Values.password }}
       {{ .Values.user }}/networks/ip:
         {{- range $.Values.allowedNetworkIps }}
         - {{ . | quote }}
         {{- end }}
       {{ .Values.user }}/profile: default
       {{ .Values.user }}/quota: default
+    {{- end }}
 
     profiles:
       {{- merge dict .Values.profiles .Values.defaultProfiles | toYaml | nindent 6 }}

diff --git a/charts/clickhouse/values.yaml b/charts/clickhouse/values.yaml
@@ -142,11 +142,17 @@ cluster: cluster
 # database: signoz_metrics
 # -- Clickhouse trace database (SigNoz Traces)
 # traceDatabase: signoz_traces
+
 # -- Clickhouse user
 user: admin
-# -- Clickhouse password
+# -- Clickhouse password.Ignored if existingSecret is set
 password: admin
 
+# -- Name of an existing Kubernetes secret object containing the password and the key pointing to the password in your Kubernetes secret
+existingSecret: {}
+  # name: 
+  # passwordkey: 
+
 # -- Clickhouse cluster replicas
 replicasCount: 1
 # -- Clickhouse cluster shards