From 27273651288c2df62718debdf9543cf914830b8f Mon Sep 17 00:00:00 2001 From: Nam Hai Nguyen Date: Mon, 29 Dec 2025 09:59:27 +0000 Subject: [PATCH 1/5] Reference credentials in secret Signed-off-by: Nam Hai Nguyen --- charts/clickstack/Chart.yaml | 2 +- charts/clickstack/templates/hyperdx-deployment.yaml | 5 ++++- charts/clickstack/templates/otel-collector-deployment.yaml | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/charts/clickstack/Chart.yaml b/charts/clickstack/Chart.yaml index d6e0797..fac1ba6 100644 --- a/charts/clickstack/Chart.yaml +++ b/charts/clickstack/Chart.yaml @@ -15,5 +15,5 @@ annotations: - name: Upstream Project url: https://github.com/hyperdxio/hyperdx type: application -version: 1.0.1 +version: 1.0.2 appVersion: 2.8.0 diff --git a/charts/clickstack/templates/hyperdx-deployment.yaml b/charts/clickstack/templates/hyperdx-deployment.yaml index caafd3d..3fc27c7 100644 --- a/charts/clickstack/templates/hyperdx-deployment.yaml +++ b/charts/clickstack/templates/hyperdx-deployment.yaml @@ -114,7 +114,10 @@ spec: {{- else }} {{- if .Values.hyperdx.defaultConnections }} - name: DEFAULT_CONNECTIONS - value: {{ tpl .Values.hyperdx.defaultConnections . | quote }} + valueFrom: + secretKeyRef: + name: {{ include "clickstack.fullname" . }}-clickhouse-secrets + key: defaultConnections {{- end }} {{- if .Values.hyperdx.defaultSources }} - name: DEFAULT_SOURCES diff --git a/charts/clickstack/templates/otel-collector-deployment.yaml b/charts/clickstack/templates/otel-collector-deployment.yaml index 95b066f..c4fcf0c 100644 --- a/charts/clickstack/templates/otel-collector-deployment.yaml +++ b/charts/clickstack/templates/otel-collector-deployment.yaml @@ -99,7 +99,10 @@ spec: - name: CLICKHOUSE_USER value: {{ .Values.otel.clickhouseUser | default .Values.clickhouse.config.users.otelUserName }} - name: CLICKHOUSE_PASSWORD - value: {{ .Values.otel.clickhousePassword | default .Values.clickhouse.config.users.otelUserPassword }} + valueFrom: + secretKeyRef: + name: {{ include "clickstack.fullname" . }}-clickhouse-secrets + key: otelUserPassword {{- if .Values.otel.customConfig }} - name: CUSTOM_OTELCOL_CONFIG_FILE value: /etc/otelcol-contrib/custom.config.yaml From cfc00194927f5c0014faa59a6bb863ee749337d4 Mon Sep 17 00:00:00 2001 From: Nam Hai Nguyen Date: Mon, 29 Dec 2025 12:19:18 +0000 Subject: [PATCH 2/5] Update hyperdx secret Signed-off-by: Nam Hai Nguyen --- charts/clickstack/templates/hyperdx-deployment.yaml | 2 +- charts/clickstack/templates/secrets.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/charts/clickstack/templates/hyperdx-deployment.yaml b/charts/clickstack/templates/hyperdx-deployment.yaml index 3fc27c7..8e2e365 100644 --- a/charts/clickstack/templates/hyperdx-deployment.yaml +++ b/charts/clickstack/templates/hyperdx-deployment.yaml @@ -116,7 +116,7 @@ spec: - name: DEFAULT_CONNECTIONS valueFrom: secretKeyRef: - name: {{ include "clickstack.fullname" . }}-clickhouse-secrets + name: {{ include "clickstack.fullname" . }}-app-secrets key: defaultConnections {{- end }} {{- if .Values.hyperdx.defaultSources }} diff --git a/charts/clickstack/templates/secrets.yaml b/charts/clickstack/templates/secrets.yaml index 6550b59..494dbe6 100644 --- a/charts/clickstack/templates/secrets.yaml +++ b/charts/clickstack/templates/secrets.yaml @@ -7,6 +7,7 @@ metadata: type: Opaque data: api-key: {{ .Values.hyperdx.apiKey | b64enc }} + defaultConnections: {{ .Values.hyperdx.defaultConnections | toString | b64enc }} {{- if .Values.clickhouse.enabled }} --- apiVersion: v1 @@ -19,4 +20,4 @@ type: Opaque data: appUserPassword: {{ .Values.clickhouse.config.users.appUserPassword | toString | b64enc }} otelUserPassword: {{ .Values.clickhouse.config.users.otelUserPassword | toString | b64enc }} -{{- end }} \ No newline at end of file +{{- end }} From 305850c8533d6ae509f1a96ba80db439ed0012b8 Mon Sep 17 00:00:00 2001 From: Nam Hai Nguyen Date: Fri, 16 Jan 2026 03:38:24 +0000 Subject: [PATCH 3/5] Revert Chart.yaml Signed-off-by: Nam Hai Nguyen --- charts/clickstack/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/clickstack/Chart.yaml b/charts/clickstack/Chart.yaml index fac1ba6..d6e0797 100644 --- a/charts/clickstack/Chart.yaml +++ b/charts/clickstack/Chart.yaml @@ -15,5 +15,5 @@ annotations: - name: Upstream Project url: https://github.com/hyperdxio/hyperdx type: application -version: 1.0.2 +version: 1.0.1 appVersion: 2.8.0 From 0183a3bc95373d6dc6254a0caa05d95f4e53ad1c Mon Sep 17 00:00:00 2001 From: Nam Hai Nguyen Date: Fri, 16 Jan 2026 03:50:28 +0000 Subject: [PATCH 4/5] Add changeset Signed-off-by: Nam Hai Nguyen --- .changeset/moody-lemons-open.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/moody-lemons-open.md diff --git a/.changeset/moody-lemons-open.md b/.changeset/moody-lemons-open.md new file mode 100644 index 0000000..e6e6355 --- /dev/null +++ b/.changeset/moody-lemons-open.md @@ -0,0 +1,5 @@ +--- +"helm-charts": patch +--- + +Reference credentials in secret From 1f84a77033c4992fa53cc8e4ac82e9bd6fed49d8 Mon Sep 17 00:00:00 2001 From: Nam Hai Nguyen Date: Wed, 28 Jan 2026 04:23:19 +0000 Subject: [PATCH 5/5] Update tests Signed-off-by: Nam Hai Nguyen --- .../tests/external-connections-secret_test.yaml | 16 +++++----------- charts/clickstack/tests/otel-collector_test.yaml | 10 ++++++++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/charts/clickstack/tests/external-connections-secret_test.yaml b/charts/clickstack/tests/external-connections-secret_test.yaml index ffc4af6..a833faf 100644 --- a/charts/clickstack/tests/external-connections-secret_test.yaml +++ b/charts/clickstack/tests/external-connections-secret_test.yaml @@ -152,16 +152,10 @@ tests: path: spec.template.spec.containers[0].env content: name: DEFAULT_CONNECTIONS - value: | - [ - { - "name": "Local ClickHouse", - "host": "http://RELEASE-NAME-clickstack-clickhouse:8123", - "port": 8123, - "username": "app", - "password": "hyperdx" - } - ] + valueFrom: + secretKeyRef: + key: defaultConnections + name: RELEASE-NAME-clickstack-app-secrets - exists: path: spec.template.spec.containers[0].env[?(@.name == "DEFAULT_SOURCES")] @@ -252,4 +246,4 @@ tests: secretKeyRef: name: "" key: "sources.json" - optional: false \ No newline at end of file + optional: false diff --git a/charts/clickstack/tests/otel-collector_test.yaml b/charts/clickstack/tests/otel-collector_test.yaml index 41f831c..8e358f9 100644 --- a/charts/clickstack/tests/otel-collector_test.yaml +++ b/charts/clickstack/tests/otel-collector_test.yaml @@ -103,7 +103,10 @@ tests: path: spec.template.spec.containers[0].env content: name: CLICKHOUSE_PASSWORD - value: test-password + valueFrom: + secretKeyRef: + name: test-release-clickstack-clickhouse-secrets + key: otelUserPassword - documentSelector: *deployment-selector contains: path: spec.template.spec.containers[0].env @@ -439,7 +442,10 @@ tests: path: spec.template.spec.containers[0].env content: name: CLICKHOUSE_PASSWORD - value: "custom-password" + valueFrom: + secretKeyRef: + name: test-release-clickstack-clickhouse-secrets + key: otelUserPassword - it: should render custom environment variables when specified set: