feat: support 'clickhouseUser' and 'clickhousePassword' values (#26)

Author: wrn14897

.changeset/fresh-papers-roll.md

@@ -0,0 +1,5 @@
+---
+"helm-charts": patch
+---
+
+feat: add 'clickhouseUser' and 'clickhousePassword' otel settings

charts/hdx-oss-v2/data/users.xml

@@ -42,8 +42,8 @@
                 <query>GRANT SELECT ON default.*</query>
             </grants>
         </app>
-        <otelcollector>
-            <password>{{ .Values.clickhouse.config.users.otelUserPassword }}</password>
+        <{{ .Values.otel.clickhouseUser | default .Values.clickhouse.config.users.otelUserName }}>
+            <password>{{ .Values.otel.clickhousePassword | default .Values.clickhouse.config.users.otelUserPassword }}</password>
             <networks>
                 {{- if .Values.clickhouse.config.clusterCidrs }}
                 {{- range .Values.clickhouse.config.clusterCidrs }}
@@ -59,7 +59,7 @@
             <grants>
                 <query>GRANT SELECT,INSERT,CREATE,SHOW ON default.*</query>
             </grants>
-        </otelcollector>
+        </{{ .Values.otel.clickhouseUser | default .Values.clickhouse.config.users.otelUserName }}>
     </users>
 
     <quotas>

charts/hdx-oss-v2/templates/otel-collector-deployment.yaml

@@ -48,9 +48,9 @@ spec:
                   name: {{ include "hdx-oss.fullname" . }}-app-secrets
                   key: api-key
             - name: CLICKHOUSE_USER
-              value: "otelcollector"
+              value: {{ .Values.otel.clickhouseUser | default .Values.clickhouse.config.users.otelUserName }}
             - name: CLICKHOUSE_PASSWORD
-              value: {{ .Values.clickhouse.config.users.otelUserPassword }}
+              value: {{ .Values.otel.clickhousePassword | default .Values.clickhouse.config.users.otelUserPassword }}
 ---
 apiVersion: v1
 kind: Service
@@ -78,4 +78,4 @@ spec:
   selector:
     {{- include "hdx-oss.selectorLabels" . | nindent 4 }}
     app: otel-collector
-{{- end }}
+{{- end }}

charts/hdx-oss-v2/tests/otel-collector_test.yaml

@@ -356,4 +356,36 @@ tests:
           path: spec.template.spec.containers[0].env
           content:
             name: HYPERDX_OTEL_EXPORTER_CLICKHOUSE_DATABASE
-            value: "custom_db"
+            value: "custom_db"
+
+  - it: should use custom clickhouse credentials when specified
+    set:
+      otel:
+        enabled: true
+        image: hyperdx/hyperdx-otel-collector:2-beta
+        clickhouseUser: "custom-user"
+        clickhousePassword: "custom-password"
+      hyperdx:
+        logLevel: info
+      clickhouse:
+        config:
+          users:
+            otelUserPassword: default-password
+    release:
+      name: test-release
+    asserts:
+      - documentIndex: 0
+        isKind:
+          of: Deployment
+      - documentIndex: 0
+        contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: CLICKHOUSE_USER
+            value: "custom-user"
+      - documentIndex: 0
+        contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: CLICKHOUSE_PASSWORD
+            value: "custom-password"

charts/hdx-oss-v2/values.yaml

@@ -176,6 +176,7 @@ clickhouse:
     users:
       appUserPassword: "hyperdx"
       otelUserPassword: "otelcollectorpass"
+      otelUserName: "otelcollector"
     # Network CIDRs for Kubernetes cluster access control
     # These CIDRs ensure ClickHouse connections are locked down to intra-cluster only
     # For PRODUCTION: Remove development CIDRs and keep only your cluster's specific CIDR
@@ -201,6 +202,8 @@ otel:
   # Leave empty if you want to use the chart's Clickhouse service.
   # Example: clickhouseEndpoint: "tcp://custom-clickhouse-service:9000"
   clickhouseEndpoint:
+  clickhouseUser:
+  clickhousePassword:
   # Clickhouse Prometheus endpoint - defaults to chart's Clickhouse prometheus service. Customize if you want to use a different Clickhouse prometheus service. 
   # Leave empty if prometheus is disabled.
   # Example: clickhousePrometheusEndpoint: "http://custom-clickhouse-service:9363"