Skip to content

Commit 46b47bb

Browse files
committed
fix: properly handle ignore certificate on health check
1 parent 1bca776 commit 46b47bb

File tree

6 files changed

+15
-4
lines changed

6 files changed

+15
-4
lines changed

charts/signoz/templates/_clickhouse.tpl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ Minimized ClickHouse ENV variables for user credentials
8989
value: {{ .Values.clickhouse.password | quote }}
9090
- name: CLICKHOUSE_SECURE
9191
value: {{ .Values.clickhouse.secure | quote }}
92+
- name: CLICKHOUSE_VERIFY
93+
value: {{ .Values.clickhouse.verify | quote }}
9294
{{- else -}}
9395
- name: CLICKHOUSE_HOST
9496
value: {{ required "externalClickhouse.host is required if not clickhouse.enabled" .Values.externalClickhouse.host | quote }}
@@ -112,6 +114,8 @@ Minimized ClickHouse ENV variables for user credentials
112114
{{- end }}
113115
- name: CLICKHOUSE_SECURE
114116
value: {{ .Values.externalClickhouse.secure | quote }}
117+
- name: CLICKHOUSE_VERIFY
118+
value: {{ .Values.externalClickhouse.verify | quote }}
115119
{{- end }}
116120
{{- end }}
117121

charts/signoz/templates/_helpers.tpl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -493,6 +493,13 @@ imagePullSecrets:
493493
{{- end }}
494494
{{- end }}
495495
496+
{{/*
497+
Generate --no-check-certificate flag based on CLICKHOUSE_VERIFY environment variable
498+
*/}}
499+
{{- define "wget.clickhouse.noVerifyFlag" -}}
500+
$(if [ "${CLICKHOUSE_VERIFY}" = "false" ]; then echo "--no-check-certificate"; fi)
501+
{{- end -}}
502+
496503
497504
{{/*
498505
Create Env

charts/signoz/templates/otel-collector/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ spec:
8282
command:
8383
- sh
8484
- -c
85-
- until wget --user "${CLICKHOUSE_USER}:${CLICKHOUSE_PASSWORD}" --spider -q {{ include "clickhouse.httpUrl" $ }}{{ .endpoint }}; do echo -e "{{ .waitMessage }}"; sleep {{ .delay }}; done; echo -e "{{ .doneMessage }}";
85+
- until wget {{ include "wget.clickhouse.noVerifyFlag" $ }} --user "${CLICKHOUSE_USER}:${CLICKHOUSE_PASSWORD}" --spider -q {{ include "clickhouse.httpUrl" $ }}{{ .endpoint }}; do echo -e "{{ .waitMessage }}"; sleep {{ .delay }}; done; echo -e "{{ .doneMessage }}";
8686
{{- end }}
8787
resources:
8888
{{- toYaml .Values.otelCollector.initContainers.init.resources | nindent 12 }}

charts/signoz/templates/schema-migrator/migrations-async.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ spec:
4343
command:
4444
- sh
4545
- -c
46-
- until wget --user "$(CLICKHOUSE_USER):$(CLICKHOUSE_PASSWORD)" --spider -q {{ include "clickhouse.httpUrl" $ }}{{ .endpoint }}; do echo -e "{{ .waitMessage }}"; sleep {{ .delay }}; done; echo -e "{{ .doneMessage }}";
46+
- until wget {{ include "wget.clickhouse.noVerifyFlag" $ }} --user "$(CLICKHOUSE_USER):$(CLICKHOUSE_PASSWORD)" --spider -q {{ include "clickhouse.httpUrl" $ }}{{ .endpoint }}; do echo -e "{{ .waitMessage }}"; sleep {{ .delay }}; done; echo -e "{{ .doneMessage }}";
4747
{{- end }}
4848
resources:
4949
{{- toYaml .Values.schemaMigrator.initContainers.init.resources | nindent 12 }}

charts/signoz/templates/schema-migrator/migrations-sync.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ spec:
4242
command:
4343
- sh
4444
- -c
45-
- until wget --user "$(CLICKHOUSE_USER):$(CLICKHOUSE_PASSWORD)" --spider -q {{ include "clickhouse.httpUrl" $ }}{{ .endpoint }}; do echo -e "{{ .waitMessage }}"; sleep {{ .delay }}; done; echo -e "{{ .doneMessage }}";
45+
- until wget {{ include "wget.clickhouse.noVerifyFlag" $ }} --user "$(CLICKHOUSE_USER):$(CLICKHOUSE_PASSWORD)" --spider -q {{ include "clickhouse.httpUrl" $ }}{{ .endpoint }}; do echo -e "{{ .waitMessage }}"; sleep {{ .delay }}; done; echo -e "{{ .doneMessage }}";
4646
{{- end }}
4747
resources:
4848
{{- toYaml .Values.schemaMigrator.initContainers.init.resources | nindent 12 }}

charts/signoz/templates/signoz/statefulset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ spec:
6161
command:
6262
- sh
6363
- -c
64-
- until wget --user "${CLICKHOUSE_USER}:${CLICKHOUSE_PASSWORD}" --spider -q {{ include "clickhouse.httpUrl" $ }}{{ .endpoint }}; do echo -e "{{ .waitMessage }}"; sleep {{ .delay }}; done; echo -e "{{ .doneMessage }}";
64+
- until wget {{ include "wget.clickhouse.noVerifyFlag" $ }} --user "${CLICKHOUSE_USER}:${CLICKHOUSE_PASSWORD}" --spider -q {{ include "clickhouse.httpUrl" $ }}{{ .endpoint }}; do echo -e "{{ .waitMessage }}"; sleep {{ .delay }}; done; echo -e "{{ .doneMessage }}";
6565
{{- end }}
6666
resources:
6767
{{- toYaml .init.resources | nindent 12 }}

0 commit comments

Comments
 (0)