apply comment

cvat-ai · Jun 25, 2024 · 0751da3 · 0751da3
1 parent bff54e0
commit 0751da3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/changelog.d/20240625_125622_andrey_update_helm_clickhouse_config.md b/changelog.d/20240625_125622_andrey_update_helm_clickhouse_config.md
@@ -0,0 +1,4 @@
+### Added
+
+- [Helm] Ability to use an external ClickHouse instance
+  (<https://github.com/cvat-ai/cvat/pull/8048>)
diff --git a/helm-chart/Chart.yaml b/helm-chart/Chart.yaml
@@ -44,7 +44,7 @@ dependencies:
   - name: clickhouse
     version: "4.1.*"
     repository: https://charts.bitnami.com/bitnami
-    condition: analytics.enabled
+    condition: clickhouse.enabled
 
   - name: grafana
     version: "6.60.*"

diff --git a/helm-chart/templates/_helpers.tpl b/helm-chart/templates/_helpers.tpl
@@ -141,7 +141,7 @@ The name of the service account to use for backend pods
 {{- end }}
 
 {{- define "cvat.sharedClickhouseEnv" }}
-{{- if .Values.analytics.enabled}}
+{{- if .Values.analytics.enabled }}
 - name: CLICKHOUSE_HOST
   valueFrom:
     secretKeyRef:

diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml
@@ -325,6 +325,7 @@ analytics:
   clickhouseDb: cvat
   clickhouseUser: user
   clickhousePassword: user
+  # Set clickhouse.enabled to false in case of external db usage
   clickhouseHost: "{{ .Release.Name }}-clickhouse"
   clickhousePort: 8123
 
@@ -348,6 +349,8 @@ vector:
     tag: "0.26.0-alpine"
 
 clickhouse:
+  # Set to false in case of external db usage
+  enabled: true
   shards: 1
   replicaCount: 1
   extraEnvVarsSecret: cvat-analytics-secret