From 71de9a2e39a43c693e82c937faeda3986af5db1c Mon Sep 17 00:00:00 2001
From: Helio Machado <0x2b3bfa0+git@googlemail.com>
Date: Fri, 12 Apr 2024 16:20:29 +0200
Subject: [PATCH] Use DVCX_CH_DSN everywhere (#382)

* Use DVCX_CH_DSN everywhere

* Update configmap-studio.yaml

* Update Chart.yaml

* Helm-Docs update

---------

Co-authored-by: 0x2b3bfa0 <0x2b3bfa0@users.noreply.github.com>
---
 charts/studio/Chart.yaml                      | 2 +-
 charts/studio/README.md                       | 2 +-
 charts/studio/templates/configmap-studio.yaml | 3 ---
 charts/studio/templates/secret-studio.yaml    | 3 +--
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/charts/studio/Chart.yaml b/charts/studio/Chart.yaml
index 16e47b1a..40e1d32e 100644
--- a/charts/studio/Chart.yaml
+++ b/charts/studio/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: studio
 description: A Helm chart for Kubernetes
 type: application
-version: 0.13.7
+version: 0.13.8
 appVersion: "v2.105.5"
 maintainers:
   - name: iterative
diff --git a/charts/studio/README.md b/charts/studio/README.md
index 61263326..59cc28b2 100644
--- a/charts/studio/README.md
+++ b/charts/studio/README.md
@@ -1,6 +1,6 @@
 # studio
 
-![Version: 0.13.7](https://img.shields.io/badge/Version-0.13.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.105.5](https://img.shields.io/badge/AppVersion-v2.105.5-informational?style=flat-square)
+![Version: 0.13.8](https://img.shields.io/badge/Version-0.13.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.105.5](https://img.shields.io/badge/AppVersion-v2.105.5-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
diff --git a/charts/studio/templates/configmap-studio.yaml b/charts/studio/templates/configmap-studio.yaml
index e6c4199a..a2b3f461 100644
--- a/charts/studio/templates/configmap-studio.yaml
+++ b/charts/studio/templates/configmap-studio.yaml
@@ -131,6 +131,3 @@ data:
   {{- if ((.Values.ray).enabled) }}
   DVCX_RAY_URL: "http://{{ .Release.Name }}-ray-head-svc.{{ .Release.Namespace }}.svc.cluster.local:8265"
   {{- end }}
-
-  DVCX_CH_HOST: {{ $dvcxClickhouse.host | default "" | quote }}
-  DVCX_CH_DATABASE: {{ $dvcxClickhouse.database | default "" | quote }}
diff --git a/charts/studio/templates/secret-studio.yaml b/charts/studio/templates/secret-studio.yaml
index e503b2da..1ad85542 100644
--- a/charts/studio/templates/secret-studio.yaml
+++ b/charts/studio/templates/secret-studio.yaml
@@ -72,5 +72,4 @@ stringData:
 
   {{- $dvcx := .Values.global.dvcx | default dict }}
   {{- $dvcxClickhouse := $dvcx.clickHouse | default dict }}
-  DVCX_CH_USER: {{ $dvcxClickhouse.user | default "" | quote }}
-  DVCX_CH_PASSWORD: {{ $dvcxClickhouse.password | default "" | quote }}
+  DVCX_CH_DSN: {{ $dvcxClickhouse.dsn | default "" | quote }}