From a5aeb8e7ed0dc56490b490ed912b5bf4a8b352e1 Mon Sep 17 00:00:00 2001 From: Helio Machado <0x2b3bfa0+git@googlemail.com> Date: Sat, 1 Jun 2024 16:54:10 +0000 Subject: [PATCH 01/23] Add ClickHouse support --- charts/studio/Chart.lock | 7 +++++-- charts/studio/Chart.yaml | 6 +++++- charts/studio/values.yaml | 16 ++++++++++++++++ 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/charts/studio/Chart.lock b/charts/studio/Chart.lock index 6ccace4a..6c8f1ae6 100644 --- a/charts/studio/Chart.lock +++ b/charts/studio/Chart.lock @@ -5,5 +5,8 @@ dependencies: - name: postgresql repository: https://charts.bitnami.com/bitnami version: 11.9.13 -digest: sha256:4d64be3c68e02f9bf8d4468389b628383c33fc3e1902597f637c49ccf2f777d9 -generated: "2024-04-30T15:57:25.19756706Z" +- name: clickhouse + repository: https://charts.bitnami.com/bitnami + version: 6.2.0 +digest: sha256:5764f9714b4d0e478f5ea25796091919f7ca334773989ac86235c7377db85405 +generated: "2024-06-01T16:58:57.386705962Z" diff --git a/charts/studio/Chart.yaml b/charts/studio/Chart.yaml index 20f0e066..abccf7c8 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.14.2 +version: 0.14.3 appVersion: "v2.119.4" maintainers: - name: iterative @@ -17,3 +17,7 @@ dependencies: condition: postgresql.enabled version: "11.9.13" repository: "https://charts.bitnami.com/bitnami" + - name: clickhouse + condition: clickhouse.enabled + version: "6.2.0" + repository: "https://charts.bitnami.com/bitnami" diff --git a/charts/studio/values.yaml b/charts/studio/values.yaml index 071ec666..f14558b3 100644 --- a/charts/studio/values.yaml +++ b/charts/studio/values.yaml @@ -238,6 +238,22 @@ postgresql: # -- Postgres database database: iterativeai +clickhouse: + # -- ClickHouse enabled + enabled: false + # -- ClickHouse name override + fullnameOverride: studio-clickhouse + + image: + registry: docker.io + repository: bitnami/clickhouse + tag: 24.4.1-debian-12-r4 + + # Change this before deploying + auth: + username: default + password: clickhouse + # -- PgBouncer settings group pgBouncer: enabled: false From b952d6159b7c853a993470f16a99dd23f5ba8aa7 Mon Sep 17 00:00:00 2001 From: 0x2b3bfa0 <0x2b3bfa0@users.noreply.github.com> Date: Sat, 1 Jun 2024 17:10:49 +0000 Subject: [PATCH 02/23] Helm-Docs update --- charts/studio/README.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/charts/studio/README.md b/charts/studio/README.md index 178ace42..51d43db1 100644 --- a/charts/studio/README.md +++ b/charts/studio/README.md @@ -1,6 +1,6 @@ # studio -![Version: 0.14.2](https://img.shields.io/badge/Version-0.14.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.119.4](https://img.shields.io/badge/AppVersion-v2.119.4-informational?style=flat-square) +![Version: 0.14.3](https://img.shields.io/badge/Version-0.14.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.119.4](https://img.shields.io/badge/AppVersion-v2.119.4-informational?style=flat-square) A Helm chart for Kubernetes @@ -14,6 +14,7 @@ A Helm chart for Kubernetes | Repository | Name | Version | |------------|------|---------| +| https://charts.bitnami.com/bitnami | clickhouse | 6.2.0 | | https://charts.bitnami.com/bitnami | postgresql | 11.9.13 | | https://charts.bitnami.com/bitnami | redis | 17.14.3 | @@ -21,6 +22,13 @@ A Helm chart for Kubernetes | Key | Type | Default | Description | |-----|------|---------|-------------| +| clickhouse.auth.password | string | `"clickhouse"` | | +| clickhouse.auth.username | string | `"default"` | | +| clickhouse.enabled | bool | `false` | ClickHouse enabled | +| clickhouse.fullnameOverride | string | `"studio-clickhouse"` | ClickHouse name override | +| clickhouse.image.registry | string | `"docker.io"` | | +| clickhouse.image.repository | string | `"bitnami/clickhouse"` | | +| clickhouse.image.tag | string | `"24.4.1-debian-12-r4"` | | | global.basePath | string | `""` | Studio: Base path (prefix) | | global.blobvault.accessKeyId | string | `""` | Blobvault S3 access key ID | | global.blobvault.bucket | string | `""` | Blobvault S3 bucket name | From 7628ac8a5611649167acd5552ffbb2cf2f71b8f5 Mon Sep 17 00:00:00 2001 From: Helio Machado <0x2b3bfa0+git@googlemail.com> Date: Sat, 1 Jun 2024 17:12:14 +0000 Subject: [PATCH 03/23] fixup! Add ClickHouse support --- charts/studio/values.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/charts/studio/values.yaml b/charts/studio/values.yaml index f14558b3..4a690de6 100644 --- a/charts/studio/values.yaml +++ b/charts/studio/values.yaml @@ -244,11 +244,6 @@ clickhouse: # -- ClickHouse name override fullnameOverride: studio-clickhouse - image: - registry: docker.io - repository: bitnami/clickhouse - tag: 24.4.1-debian-12-r4 - # Change this before deploying auth: username: default From 66f7c4957bae3be8357e553bbfd6dee284c58be2 Mon Sep 17 00:00:00 2001 From: 0x2b3bfa0 <0x2b3bfa0@users.noreply.github.com> Date: Sat, 1 Jun 2024 17:12:34 +0000 Subject: [PATCH 04/23] Helm-Docs update --- charts/studio/README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/charts/studio/README.md b/charts/studio/README.md index 51d43db1..71ca3512 100644 --- a/charts/studio/README.md +++ b/charts/studio/README.md @@ -26,9 +26,6 @@ A Helm chart for Kubernetes | clickhouse.auth.username | string | `"default"` | | | clickhouse.enabled | bool | `false` | ClickHouse enabled | | clickhouse.fullnameOverride | string | `"studio-clickhouse"` | ClickHouse name override | -| clickhouse.image.registry | string | `"docker.io"` | | -| clickhouse.image.repository | string | `"bitnami/clickhouse"` | | -| clickhouse.image.tag | string | `"24.4.1-debian-12-r4"` | | | global.basePath | string | `""` | Studio: Base path (prefix) | | global.blobvault.accessKeyId | string | `""` | Blobvault S3 access key ID | | global.blobvault.bucket | string | `""` | Blobvault S3 bucket name | From 819bbe5acdaecfca71b8d6fc6f6166ea9ed203e0 Mon Sep 17 00:00:00 2001 From: Helio Machado <0x2b3bfa0+git@googlemail.com> Date: Sat, 1 Jun 2024 19:16:34 +0200 Subject: [PATCH 05/23] Update values.yaml --- charts/studio/values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/studio/values.yaml b/charts/studio/values.yaml index 4a690de6..c77b69bb 100644 --- a/charts/studio/values.yaml +++ b/charts/studio/values.yaml @@ -246,7 +246,9 @@ clickhouse: # Change this before deploying auth: + # -- ClickHouse username username: default + # -- ClickHouse password password: clickhouse # -- PgBouncer settings group From 8e7894b7c79e9f711f7d9f760d3113591865d1ba Mon Sep 17 00:00:00 2001 From: 0x2b3bfa0 <0x2b3bfa0@users.noreply.github.com> Date: Sat, 1 Jun 2024 17:16:47 +0000 Subject: [PATCH 06/23] Helm-Docs update --- charts/studio/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/studio/README.md b/charts/studio/README.md index 71ca3512..ad12baff 100644 --- a/charts/studio/README.md +++ b/charts/studio/README.md @@ -22,8 +22,8 @@ A Helm chart for Kubernetes | Key | Type | Default | Description | |-----|------|---------|-------------| -| clickhouse.auth.password | string | `"clickhouse"` | | -| clickhouse.auth.username | string | `"default"` | | +| clickhouse.auth.password | string | `"clickhouse"` | ClickHouse password | +| clickhouse.auth.username | string | `"default"` | ClickHouse username | | clickhouse.enabled | bool | `false` | ClickHouse enabled | | clickhouse.fullnameOverride | string | `"studio-clickhouse"` | ClickHouse name override | | global.basePath | string | `""` | Studio: Base path (prefix) | From 5de62326470bac7f02f81a81380d2e506e7bbe37 Mon Sep 17 00:00:00 2001 From: Helio Machado <0x2b3bfa0+git@googlemail.com> Date: Sat, 1 Jun 2024 17:32:10 +0000 Subject: [PATCH 07/23] Automate DSN generation --- charts/studio/templates/secret-studio.yaml | 6 +++++- charts/studio/values.yaml | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/charts/studio/templates/secret-studio.yaml b/charts/studio/templates/secret-studio.yaml index 1ad85542..f841e0da 100644 --- a/charts/studio/templates/secret-studio.yaml +++ b/charts/studio/templates/secret-studio.yaml @@ -72,4 +72,8 @@ stringData: {{- $dvcx := .Values.global.dvcx | default dict }} {{- $dvcxClickhouse := $dvcx.clickHouse | default dict }} - DVCX_CH_DSN: {{ $dvcxClickhouse.dsn | default "" | quote }} + {{- if dvcxClickhouse.dsn }} + DVCX_CH_DSN: {{ $dvcxClickhouse.dsn | quote }} + {{- else if .Values.clickhouse.enabled }} + DVCX_CH_DSN: clickhouse+native://default:{{ .Values.clickhouse.auth.password }}@{{ .Values.clickhouse.fullnameOverride }}.{{ .Release.Namespace }}.svc.cluster.local/default + {{- end }} diff --git a/charts/studio/values.yaml b/charts/studio/values.yaml index c77b69bb..a9bac23f 100644 --- a/charts/studio/values.yaml +++ b/charts/studio/values.yaml @@ -246,8 +246,6 @@ clickhouse: # Change this before deploying auth: - # -- ClickHouse username - username: default # -- ClickHouse password password: clickhouse From d3f27de1770e1ee6943e3ac386ff6f679ea3e5b5 Mon Sep 17 00:00:00 2001 From: 0x2b3bfa0 <0x2b3bfa0@users.noreply.github.com> Date: Sat, 1 Jun 2024 17:32:57 +0000 Subject: [PATCH 08/23] Helm-Docs update --- charts/studio/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/charts/studio/README.md b/charts/studio/README.md index ad12baff..bc7a8a37 100644 --- a/charts/studio/README.md +++ b/charts/studio/README.md @@ -23,7 +23,6 @@ A Helm chart for Kubernetes | Key | Type | Default | Description | |-----|------|---------|-------------| | clickhouse.auth.password | string | `"clickhouse"` | ClickHouse password | -| clickhouse.auth.username | string | `"default"` | ClickHouse username | | clickhouse.enabled | bool | `false` | ClickHouse enabled | | clickhouse.fullnameOverride | string | `"studio-clickhouse"` | ClickHouse name override | | global.basePath | string | `""` | Studio: Base path (prefix) | From 0472419f07cc4840a2341deb2ecc481f3572cffa Mon Sep 17 00:00:00 2001 From: Helio Machado <0x2b3bfa0+git@googlemail.com> Date: Sat, 1 Jun 2024 17:35:59 +0000 Subject: [PATCH 09/23] fixup! Automate DSN generation --- charts/studio/templates/secret-studio.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/studio/templates/secret-studio.yaml b/charts/studio/templates/secret-studio.yaml index f841e0da..6a19fd1f 100644 --- a/charts/studio/templates/secret-studio.yaml +++ b/charts/studio/templates/secret-studio.yaml @@ -72,7 +72,7 @@ stringData: {{- $dvcx := .Values.global.dvcx | default dict }} {{- $dvcxClickhouse := $dvcx.clickHouse | default dict }} - {{- if dvcxClickhouse.dsn }} + {{- if $dvcxClickhouse.dsn }} DVCX_CH_DSN: {{ $dvcxClickhouse.dsn | quote }} {{- else if .Values.clickhouse.enabled }} DVCX_CH_DSN: clickhouse+native://default:{{ .Values.clickhouse.auth.password }}@{{ .Values.clickhouse.fullnameOverride }}.{{ .Release.Namespace }}.svc.cluster.local/default From 0dc4467185337279d8c2a3e38760a54cca0abeb4 Mon Sep 17 00:00:00 2001 From: Helio Machado <0x2b3bfa0+git@googlemail.com> Date: Sun, 2 Jun 2024 07:15:01 +0200 Subject: [PATCH 10/23] Update helm-lint-and-install.yaml --- .github/workflows/helm-lint-and-install.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/helm-lint-and-install.yaml b/.github/workflows/helm-lint-and-install.yaml index 33727732..75234e2b 100644 --- a/.github/workflows/helm-lint-and-install.yaml +++ b/.github/workflows/helm-lint-and-install.yaml @@ -59,7 +59,7 @@ jobs: if: steps.list-changed.outputs.changed == 'true' run: | ct lint-and-install --target-branch ${{ github.event.repository.default_branch }} --upgrade --skip-missing-values --debug \ - --helm-extra-set-args '--set ci=true --set global.blobvault.persistentVolume.storageClassName="standard" --set imagePullSecrets[0].name=iterativeai --set dockerUsername=${{ vars.ITERATIVE_DOCKER_REGISTRY_USER }} --set dockerPassword=${{ secrets.ITERATIVE_DOCKER_REGISTRY_PASSWORD }} --set dockerServer=docker.iterative.ai' + --helm-extra-set-args '--set ci=true --set global.blobvault.persistentVolume.storageClassName="standard" --set clickhouse.auth.password="clickhouse" --set imagePullSecrets[0].name=iterativeai --set dockerUsername=${{ vars.ITERATIVE_DOCKER_REGISTRY_USER }} --set dockerPassword=${{ secrets.ITERATIVE_DOCKER_REGISTRY_PASSWORD }} --set dockerServer=docker.iterative.ai' helm-docs: runs-on: ubuntu-latest From 02a363a47f9477429ace51b113bdd51adf4e2d8c Mon Sep 17 00:00:00 2001 From: Helio Machado <0x2b3bfa0+git@googlemail.com> Date: Sun, 2 Jun 2024 23:03:14 +0200 Subject: [PATCH 11/23] Disable TLS --- charts/studio/templates/secret-studio.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/studio/templates/secret-studio.yaml b/charts/studio/templates/secret-studio.yaml index 6a19fd1f..e627d76a 100644 --- a/charts/studio/templates/secret-studio.yaml +++ b/charts/studio/templates/secret-studio.yaml @@ -75,5 +75,5 @@ stringData: {{- if $dvcxClickhouse.dsn }} DVCX_CH_DSN: {{ $dvcxClickhouse.dsn | quote }} {{- else if .Values.clickhouse.enabled }} - DVCX_CH_DSN: clickhouse+native://default:{{ .Values.clickhouse.auth.password }}@{{ .Values.clickhouse.fullnameOverride }}.{{ .Release.Namespace }}.svc.cluster.local/default + DVCX_CH_DSN: clickhouse+native://default:{{ .Values.clickhouse.auth.password }}@{{ .Values.clickhouse.fullnameOverride }}.{{ .Release.Namespace }}.svc.cluster.local/default?secure=False {{- end }} From 1f78544934f1347af6eec23d00f170d2b670ea72 Mon Sep 17 00:00:00 2001 From: Helio Machado <0x2b3bfa0+git@googlemail.com> Date: Tue, 4 Jun 2024 06:14:26 +0200 Subject: [PATCH 12/23] Update values.yaml --- charts/studio/values.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/charts/studio/values.yaml b/charts/studio/values.yaml index a9bac23f..2a2e1e1d 100644 --- a/charts/studio/values.yaml +++ b/charts/studio/values.yaml @@ -249,6 +249,9 @@ clickhouse: # -- ClickHouse password password: clickhouse + shards: 1 + replicaCount: 1 + # -- PgBouncer settings group pgBouncer: enabled: false From ca259af0c336f3e3ec3993e59b0bc9b75602789a Mon Sep 17 00:00:00 2001 From: 0x2b3bfa0 <0x2b3bfa0@users.noreply.github.com> Date: Tue, 4 Jun 2024 04:14:41 +0000 Subject: [PATCH 13/23] Helm-Docs update --- charts/studio/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/studio/README.md b/charts/studio/README.md index bc7a8a37..35cab03a 100644 --- a/charts/studio/README.md +++ b/charts/studio/README.md @@ -25,6 +25,8 @@ A Helm chart for Kubernetes | clickhouse.auth.password | string | `"clickhouse"` | ClickHouse password | | clickhouse.enabled | bool | `false` | ClickHouse enabled | | clickhouse.fullnameOverride | string | `"studio-clickhouse"` | ClickHouse name override | +| clickhouse.replicaCount | int | `1` | | +| clickhouse.shards | int | `1` | | | global.basePath | string | `""` | Studio: Base path (prefix) | | global.blobvault.accessKeyId | string | `""` | Blobvault S3 access key ID | | global.blobvault.bucket | string | `""` | Blobvault S3 bucket name | From 8ec35bb30b37cb028f1a1e3642081d10568b36a1 Mon Sep 17 00:00:00 2001 From: Helio Machado <0x2b3bfa0+git@googlemail.com> Date: Tue, 4 Jun 2024 06:15:04 +0200 Subject: [PATCH 14/23] Update values.yaml --- charts/studio/values.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/charts/studio/values.yaml b/charts/studio/values.yaml index 2a2e1e1d..e8383338 100644 --- a/charts/studio/values.yaml +++ b/charts/studio/values.yaml @@ -244,14 +244,15 @@ clickhouse: # -- ClickHouse name override fullnameOverride: studio-clickhouse + # Shards / replicas configuration + shards: 1 + replicaCount: 1 + # Change this before deploying auth: # -- ClickHouse password password: clickhouse - shards: 1 - replicaCount: 1 - # -- PgBouncer settings group pgBouncer: enabled: false From e3217de4db22a43f917bd3326b78264e444022c8 Mon Sep 17 00:00:00 2001 From: Helio Machado <0x2b3bfa0+git@googlemail.com> Date: Tue, 4 Jun 2024 06:17:47 +0200 Subject: [PATCH 15/23] Update values.yaml --- charts/studio/values.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/studio/values.yaml b/charts/studio/values.yaml index e8383338..39a7a507 100644 --- a/charts/studio/values.yaml +++ b/charts/studio/values.yaml @@ -245,13 +245,13 @@ clickhouse: fullnameOverride: studio-clickhouse # Shards / replicas configuration - shards: 1 replicaCount: 1 - + shards: 1 + # Change this before deploying auth: # -- ClickHouse password - password: clickhouse + password: "" # -- PgBouncer settings group pgBouncer: From de6a23ca999292776a03e2a6cdfb37a5a8e17d1e Mon Sep 17 00:00:00 2001 From: 0x2b3bfa0 <0x2b3bfa0@users.noreply.github.com> Date: Tue, 4 Jun 2024 04:18:02 +0000 Subject: [PATCH 16/23] Helm-Docs update --- charts/studio/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/studio/README.md b/charts/studio/README.md index 35cab03a..a0a39813 100644 --- a/charts/studio/README.md +++ b/charts/studio/README.md @@ -22,7 +22,7 @@ A Helm chart for Kubernetes | Key | Type | Default | Description | |-----|------|---------|-------------| -| clickhouse.auth.password | string | `"clickhouse"` | ClickHouse password | +| clickhouse.auth.password | string | `""` | ClickHouse password | | clickhouse.enabled | bool | `false` | ClickHouse enabled | | clickhouse.fullnameOverride | string | `"studio-clickhouse"` | ClickHouse name override | | clickhouse.replicaCount | int | `1` | | From 13299c768cf5bc300f49d5c6102539e2db4fa8e9 Mon Sep 17 00:00:00 2001 From: Helio Machado <0x2b3bfa0+git@googlemail.com> Date: Tue, 4 Jun 2024 06:18:59 +0200 Subject: [PATCH 17/23] Update secret-studio.yaml --- charts/studio/templates/secret-studio.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/studio/templates/secret-studio.yaml b/charts/studio/templates/secret-studio.yaml index e627d76a..64f60b0c 100644 --- a/charts/studio/templates/secret-studio.yaml +++ b/charts/studio/templates/secret-studio.yaml @@ -75,5 +75,9 @@ stringData: {{- if $dvcxClickhouse.dsn }} DVCX_CH_DSN: {{ $dvcxClickhouse.dsn | quote }} {{- else if .Values.clickhouse.enabled }} - DVCX_CH_DSN: clickhouse+native://default:{{ .Values.clickhouse.auth.password }}@{{ .Values.clickhouse.fullnameOverride }}.{{ .Release.Namespace }}.svc.cluster.local/default?secure=False + DVCX_CH_DSN: > + clickhouse+native:// + {{ .Values.clickhouse.auth.username }}:{{ .Values.clickhouse.auth.password }}@ + {{ .Values.clickhouse.fullnameOverride }}.{{ .Release.Namespace }}.svc.cluster.local/ + default?secure=False {{- end }} From 3fd192c92295443695daf6d7dad42f0c7acdc7f0 Mon Sep 17 00:00:00 2001 From: Helio Machado <0x2b3bfa0+git@googlemail.com> Date: Tue, 4 Jun 2024 06:19:21 +0200 Subject: [PATCH 18/23] Update helm-lint-and-install.yaml --- .github/workflows/helm-lint-and-install.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/helm-lint-and-install.yaml b/.github/workflows/helm-lint-and-install.yaml index 75234e2b..33727732 100644 --- a/.github/workflows/helm-lint-and-install.yaml +++ b/.github/workflows/helm-lint-and-install.yaml @@ -59,7 +59,7 @@ jobs: if: steps.list-changed.outputs.changed == 'true' run: | ct lint-and-install --target-branch ${{ github.event.repository.default_branch }} --upgrade --skip-missing-values --debug \ - --helm-extra-set-args '--set ci=true --set global.blobvault.persistentVolume.storageClassName="standard" --set clickhouse.auth.password="clickhouse" --set imagePullSecrets[0].name=iterativeai --set dockerUsername=${{ vars.ITERATIVE_DOCKER_REGISTRY_USER }} --set dockerPassword=${{ secrets.ITERATIVE_DOCKER_REGISTRY_PASSWORD }} --set dockerServer=docker.iterative.ai' + --helm-extra-set-args '--set ci=true --set global.blobvault.persistentVolume.storageClassName="standard" --set imagePullSecrets[0].name=iterativeai --set dockerUsername=${{ vars.ITERATIVE_DOCKER_REGISTRY_USER }} --set dockerPassword=${{ secrets.ITERATIVE_DOCKER_REGISTRY_PASSWORD }} --set dockerServer=docker.iterative.ai' helm-docs: runs-on: ubuntu-latest From 1ca54dfe5ba923df6515a8abd5bb7a57054eff6f Mon Sep 17 00:00:00 2001 From: Helio Machado <0x2b3bfa0+git@googlemail.com> Date: Tue, 4 Jun 2024 06:24:19 +0200 Subject: [PATCH 19/23] Update secret-studio.yaml --- charts/studio/templates/secret-studio.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/studio/templates/secret-studio.yaml b/charts/studio/templates/secret-studio.yaml index 64f60b0c..84d73536 100644 --- a/charts/studio/templates/secret-studio.yaml +++ b/charts/studio/templates/secret-studio.yaml @@ -75,7 +75,7 @@ stringData: {{- if $dvcxClickhouse.dsn }} DVCX_CH_DSN: {{ $dvcxClickhouse.dsn | quote }} {{- else if .Values.clickhouse.enabled }} - DVCX_CH_DSN: > + DVCX_CH_DSN: clickhouse+native:// {{ .Values.clickhouse.auth.username }}:{{ .Values.clickhouse.auth.password }}@ {{ .Values.clickhouse.fullnameOverride }}.{{ .Release.Namespace }}.svc.cluster.local/ From 0cc10e9505017a4c0ce5085538424c1c5e09c4b2 Mon Sep 17 00:00:00 2001 From: Helio Machado <0x2b3bfa0+git@googlemail.com> Date: Tue, 4 Jun 2024 06:27:34 +0200 Subject: [PATCH 20/23] Update secret-studio.yaml --- charts/studio/templates/secret-studio.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/charts/studio/templates/secret-studio.yaml b/charts/studio/templates/secret-studio.yaml index 84d73536..853dc6d9 100644 --- a/charts/studio/templates/secret-studio.yaml +++ b/charts/studio/templates/secret-studio.yaml @@ -75,9 +75,5 @@ stringData: {{- if $dvcxClickhouse.dsn }} DVCX_CH_DSN: {{ $dvcxClickhouse.dsn | quote }} {{- else if .Values.clickhouse.enabled }} - DVCX_CH_DSN: - clickhouse+native:// - {{ .Values.clickhouse.auth.username }}:{{ .Values.clickhouse.auth.password }}@ - {{ .Values.clickhouse.fullnameOverride }}.{{ .Release.Namespace }}.svc.cluster.local/ - default?secure=False + DVCX_CH_DSN: clickhouse+native://{{ .Values.clickhouse.auth.username }}:{{ .Values.clickhouse.auth.password }}@{{ .Values.clickhouse.fullnameOverride }}.{{ .Release.Namespace }}.svc.cluster.local/default?secure=False {{- end }} From a48e44e10b8e207ed03a1e97db5ead01b9a626be Mon Sep 17 00:00:00 2001 From: Helio Machado <0x2b3bfa0+git@googlemail.com> Date: Tue, 4 Jun 2024 06:37:00 +0200 Subject: [PATCH 21/23] Update helm-lint-and-install.yaml --- .github/workflows/helm-lint-and-install.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/helm-lint-and-install.yaml b/.github/workflows/helm-lint-and-install.yaml index 33727732..75234e2b 100644 --- a/.github/workflows/helm-lint-and-install.yaml +++ b/.github/workflows/helm-lint-and-install.yaml @@ -59,7 +59,7 @@ jobs: if: steps.list-changed.outputs.changed == 'true' run: | ct lint-and-install --target-branch ${{ github.event.repository.default_branch }} --upgrade --skip-missing-values --debug \ - --helm-extra-set-args '--set ci=true --set global.blobvault.persistentVolume.storageClassName="standard" --set imagePullSecrets[0].name=iterativeai --set dockerUsername=${{ vars.ITERATIVE_DOCKER_REGISTRY_USER }} --set dockerPassword=${{ secrets.ITERATIVE_DOCKER_REGISTRY_PASSWORD }} --set dockerServer=docker.iterative.ai' + --helm-extra-set-args '--set ci=true --set global.blobvault.persistentVolume.storageClassName="standard" --set clickhouse.auth.password="clickhouse" --set imagePullSecrets[0].name=iterativeai --set dockerUsername=${{ vars.ITERATIVE_DOCKER_REGISTRY_USER }} --set dockerPassword=${{ secrets.ITERATIVE_DOCKER_REGISTRY_PASSWORD }} --set dockerServer=docker.iterative.ai' helm-docs: runs-on: ubuntu-latest From 3be065fa4874e7d18430d0c3177e9175d009ef98 Mon Sep 17 00:00:00 2001 From: Helio Machado <0x2b3bfa0+git@googlemail.com> Date: Tue, 4 Jun 2024 06:37:25 +0200 Subject: [PATCH 22/23] Update values.yaml --- charts/studio/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/studio/values.yaml b/charts/studio/values.yaml index 39a7a507..59d557a9 100644 --- a/charts/studio/values.yaml +++ b/charts/studio/values.yaml @@ -251,7 +251,7 @@ clickhouse: # Change this before deploying auth: # -- ClickHouse password - password: "" + password: "clickhouse" # -- PgBouncer settings group pgBouncer: From aa1356b6a9a3af74467721d7b2cd97879cccb0fb Mon Sep 17 00:00:00 2001 From: 0x2b3bfa0 <0x2b3bfa0@users.noreply.github.com> Date: Tue, 4 Jun 2024 04:37:43 +0000 Subject: [PATCH 23/23] Helm-Docs update --- charts/studio/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/studio/README.md b/charts/studio/README.md index a0a39813..35cab03a 100644 --- a/charts/studio/README.md +++ b/charts/studio/README.md @@ -22,7 +22,7 @@ A Helm chart for Kubernetes | Key | Type | Default | Description | |-----|------|---------|-------------| -| clickhouse.auth.password | string | `""` | ClickHouse password | +| clickhouse.auth.password | string | `"clickhouse"` | ClickHouse password | | clickhouse.enabled | bool | `false` | ClickHouse enabled | | clickhouse.fullnameOverride | string | `"studio-clickhouse"` | ClickHouse name override | | clickhouse.replicaCount | int | `1` | |