From bcca61f4fd0fe3608466f7eb6ad66c3399534a60 Mon Sep 17 00:00:00 2001
From: Nick <jianchang@yunshan.net>
Date: Thu, 29 Aug 2024 17:37:03 +0800
Subject: [PATCH] fix bug

---
 charts/deepflow-agent/Chart.yaml |  2 +-
 charts/deepflow/Chart.yaml       |  2 +-
 charts/deepflow/values.yaml      | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/charts/deepflow-agent/Chart.yaml b/charts/deepflow-agent/Chart.yaml
index 406b6ad..8e1fd33 100644
--- a/charts/deepflow-agent/Chart.yaml
+++ b/charts/deepflow-agent/Chart.yaml
@@ -3,7 +3,7 @@ description: An automated observability platform for cloud-native developers.
 name: deepflow-agent
 engine: gotpl
 type: application
-version: 6.6.002
+version: 6.6.003
 appVersion: "6.6.4"
 kubeVersion: ">=1.16.0-0"
 sources:
diff --git a/charts/deepflow/Chart.yaml b/charts/deepflow/Chart.yaml
index 514b4e4..08472fa 100644
--- a/charts/deepflow/Chart.yaml
+++ b/charts/deepflow/Chart.yaml
@@ -3,7 +3,7 @@ description: An automated observability platform for cloud-native developers.
 name: deepflow
 engine: gotpl
 type: application
-version: 6.6.002
+version: 6.6.003
 appVersion: "6.6.4"
 kubeVersion: ">=1.16.0-0"
 sources:
diff --git a/charts/deepflow/values.yaml b/charts/deepflow/values.yaml
index b03a57b..9f92e79 100644
--- a/charts/deepflow/values.yaml
+++ b/charts/deepflow/values.yaml
@@ -328,9 +328,9 @@ configmap:
         database: flow_tag
         user-name: "{{ if $.Values.global.externalClickHouse.enabled }}{{ $.Values.global.externalClickHouse.username }}{{ else }}default{{end}}"
         port: 9000
-        host: '{{ if eq $.Values.storageEngine "clickhouse" }}{{ if $.Values.global.externalClickHouse.enabled }}{{ $.Release.Name }}-external-clickhouse{{ else }}{{ $.Release.Name }}-clickhouse{{ end }}{{ else }}{{ $.Release.Name }}-byconity-server{{ end }}'
+        host: '{{ if eq $.Values.global.storageEngine "clickhouse" }}{{ if $.Values.global.externalClickHouse.enabled }}{{ $.Release.Name }}-external-clickhouse{{ else }}{{ $.Release.Name }}-clickhouse{{ end }}{{ else }}{{ $.Release.Name }}-byconity-server{{ end }}'
         user-password: "{{ if $.Values.global.externalClickHouse.enabled }}{{ $.Values.global.externalClickHouse.password }}{{ else }}{{ .Values.global.password.clickhouse }}{{end}}"
-        endpoint-tcp-port-name: '{{ if eq $.Values.storageEngine "clickhouse" }}tcp-port{{ else }}port0{{ end }}'
+        endpoint-tcp-port-name: '{{ if eq $.Values.global.storageEngine "clickhouse" }}tcp-port{{ else }}port0{{ end }}'
       trisolaris:
         chrony:
           host: "{{ tpl .Values.global.ntpServer . }}"
@@ -344,7 +344,7 @@ configmap:
         database: flow_tag
         user-name: "{{ if $.Values.global.externalClickHouse.enabled }}{{ $.Values.global.externalClickHouse.username }}{{ else }}default{{end}}"
         port: 9000
-        host: '{{ if eq $.Values.storageEngine "clickhouse" }}{{ if $.Values.global.externalClickHouse.enabled }}{{ $.Release.Name }}-external-clickhouse{{ else }}{{ $.Release.Name }}-clickhouse{{ end }}{{ else }}{{ $.Release.Name }}-byconity-server{{ end }}'
+        host: '{{ if eq $.Values.global.storageEngine "clickhouse" }}{{ if $.Values.global.externalClickHouse.enabled }}{{ $.Release.Name }}-external-clickhouse{{ else }}{{ $.Release.Name }}-clickhouse{{ end }}{{ else }}{{ $.Release.Name }}-byconity-server{{ end }}'
         user-password: "{{ if $.Values.global.externalClickHouse.enabled }}{{ $.Values.global.externalClickHouse.password }}{{ else }}{{ .Values.global.password.clickhouse }}{{end}}"
         timeout: 60
       deepflow-app:
@@ -355,13 +355,13 @@ configmap:
         # use internal or external ckdb
         external: "{{ $.Values.global.externalClickHouse.enabled }}"
         type: "{{ $.Values.global.storageEngine }}"
-        host: '{{ if eq $.Values.storageEngine "clickhouse" }}{{ if $.Values.global.externalClickHouse.enabled }}{{ $.Release.Name }}-external-clickhouse{{ else }}{{ $.Release.Name }}-clickhouse{{ end }}{{ else }}{{ $.Release.Name }}-byconity-server{{ end }}'
+        host: '{{ if eq $.Values.global.storageEngine "clickhouse" }}{{ if $.Values.global.externalClickHouse.enabled }}{{ $.Release.Name }}-external-clickhouse{{ else }}{{ $.Release.Name }}-clickhouse{{ end }}{{ else }}{{ $.Release.Name }}-byconity-server{{ end }}'
         port: 9000
-        endpoint-tcp-port-name: '{{ if eq $.Values.storageEngine "clickhouse" }}tcp-port{{ else }}port0{{ end }}'
+        endpoint-tcp-port-name: '{{ if eq $.Values.global.storageEngine "clickhouse" }}tcp-port{{ else }}port0{{ end }}'
         # if `external` is 'true', default value is 'default', else 'df_cluster'
         cluster-name: "{{ if $.Values.global.externalClickHouse.enabled }}{{ $.Values.global.externalClickHouse.clusterName}}{{end}}"
         # if `external` is 'true', default value 'default', else 'df_storage'
-        storage-policy:  '{{ if eq $.Values.storageEngine "clickhouse" }}{{ if $.Values.global.externalClickHouse.enabled }}{{ $.Values.global.externalClickHouse.storagePolicy}}{{end}}{{ else }}cnch_default_s3{{ end }}'
+        storage-policy:  '{{ if eq $.Values.global.storageEngine "clickhouse" }}{{ if $.Values.global.externalClickHouse.enabled }}{{ $.Values.global.externalClickHouse.storagePolicy}}{{end}}{{ else }}cnch_default_s3{{ end }}'
       ckdb-auth:
         username: "{{ if $.Values.global.externalClickHouse.enabled }}{{ $.Values.global.externalClickHouse.username }}{{ else }}default{{end}}"
         # '#','@' special characters are not supported in passwords