Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for self-hosted ClickHouse #413

Merged
merged 23 commits into from
Jun 4, 2024
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions charts/studio/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
6 changes: 5 additions & 1 deletion charts/studio/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
6 changes: 5 additions & 1 deletion charts/studio/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -14,13 +14,17 @@ 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 |

## Values

| Key | Type | Default | Description |
|-----|------|---------|-------------|
| clickhouse.auth.password | string | `"clickhouse"` | ClickHouse password |
| clickhouse.enabled | bool | `false` | ClickHouse enabled |
| clickhouse.fullnameOverride | string | `"studio-clickhouse"` | ClickHouse name override |
| global.basePath | string | `""` | Studio: Base path (prefix) |
| global.blobvault.accessKeyId | string | `""` | Blobvault S3 access key ID |
| global.blobvault.bucket | string | `""` | Blobvault S3 bucket name |
Expand Down
6 changes: 5 additions & 1 deletion charts/studio/templates/secret-studio.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
11 changes: 11 additions & 0 deletions charts/studio/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,17 @@ postgresql:
# -- Postgres database
database: iterativeai

clickhouse:
# -- ClickHouse enabled
enabled: false
# -- ClickHouse name override
fullnameOverride: studio-clickhouse

# Change this before deploying
auth:
# -- ClickHouse password
password: clickhouse

# -- PgBouncer settings group
pgBouncer:
enabled: false
Expand Down
Loading