feat!: add clickhouse Bitnami

Author: TartanLeGrand

.github/workflows/lint-test.yaml

@@ -31,6 +31,7 @@ jobs:
       - name: Add Helm Repositories
         run: |
           helm repo add sentry-kubernetes https://sentry-kubernetes.github.io/charts
+          helm repo add bitnami https://charts.bitnami.com/bitnami
           helm repo update
 
       - name: Run chart-testing (list-changed)
@@ -47,8 +48,8 @@ jobs:
 
       - name: Create kind cluster
         if: steps.list-changed.outputs.changed == 'true'
-        uses: helm/kind-action@v1.10.0
+        uses: helm/kind-action@v1.12.0
 
       - name: Run chart-testing (install)
         if: steps.list-changed.outputs.changed == 'true'
-        run: ct install --target-branch ${{ github.event.repository.default_branch }} --helm-extra-args "--timeout 1000s --set sentry.features.enableProfiling=true --set sentry.features.enableSessionReplay=true --set sentry.features.enableFeedback=true --set sentry.features.enableSpan=true"
+        run: ct install --debug --target-branch ${{ github.event.repository.default_branch }} --helm-extra-args "--timeout 1000s"

charts/sentry/Chart.lock

@@ -9,11 +9,8 @@ dependencies:
   repository: oci://registry-1.docker.io/bitnamicharts
   version: 29.3.14
 - name: clickhouse
-  repository: https://sentry-kubernetes.github.io/charts
-  version: 4.0.1
-- name: zookeeper
-  repository: oci://registry-1.docker.io/bitnamicharts
-  version: 11.4.11
+  repository: https://charts.bitnami.com/bitnami
+  version: 4.6.0
 - name: rabbitmq
   repository: oci://registry-1.docker.io/bitnamicharts
   version: 11.16.2
@@ -23,5 +20,5 @@ dependencies:
 - name: nginx
   repository: oci://registry-1.docker.io/bitnamicharts
   version: 18.2.5
-digest: sha256:f57f1f1f8d455729a7e04eb41c658530d710c9febe34844e062f084c17c1a382
-generated: "2025-07-21T06:40:24.054695705Z"
+digest: sha256:f2d82b26a693fed9ee3bd24fbcadafdacda7e525528bbbb347afceae607b2ecf
+generated: "2025-08-05T08:10:43.800821278+02:00"

charts/sentry/Chart.yaml

@@ -19,13 +19,9 @@ dependencies:
     version: 29.3.14
     condition: kafka.enabled
   - name: clickhouse
-    repository: https://sentry-kubernetes.github.io/charts
-    version: 4.0.1
+    repository: https://charts.bitnami.com/bitnami
+    version: 4.6.0
     condition: clickhouse.enabled
-  - name: zookeeper
-    repository: oci://registry-1.docker.io/bitnamicharts
-    version: 11.4.11
-    condition: zookeeper.enabled
   - name: rabbitmq
     repository: oci://registry-1.docker.io/bitnamicharts
     version: 11.16.2

charts/sentry/ci/kind-values.yaml

@@ -0,0 +1,28 @@
+profiles:
+  - errors-only
+
+kafka:
+  enabled: true
+  kraft:
+    enabled: true
+  provisioning:
+    replicationFactor: 1
+  controller:
+    replicaCount: 1
+  broker:
+    replicaCount: 1
+
+redis:
+  enabled: true
+  master.persistence.enabled: false
+  replica.replicaCount: 0
+
+rabbitmq:
+  enabled: false
+
+clickhouse:
+  enabled: true
+  replicaCount: 1
+  shards: 1
+  keeper:
+    replicaCount: 1

charts/sentry/templates/_helper.tpl

@@ -333,7 +333,7 @@ Set ClickHouse host
 */}}
 {{- define "sentry.clickhouse.host" -}}
 {{- if .Values.clickhouse.enabled -}}
-{{- template "sentry.clickhouse.fullname" . -}}
+{{- include "clickhouse.headlessServiceName" $.Subcharts.clickhouse -}}
 {{- else -}}
 {{ required "A valid .Values.externalClickhouse.host is required" .Values.externalClickhouse.host }}
 {{- end -}}
@@ -344,7 +344,7 @@ Set ClickHouse port
 */}}
 {{- define "sentry.clickhouse.port" -}}
 {{- if .Values.clickhouse.enabled -}}
-{{- default 9000 .Values.clickhouse.clickhouse.tcp_port }}
+{{- default 9000 .Values.clickhouse.service.ports.tcp }}
 {{- else -}}
 {{ required "A valid .Values.externalClickhouse.tcpPort is required" .Values.externalClickhouse.tcpPort }}
 {{- end -}}
@@ -355,7 +355,7 @@ Set ClickHouse HTTP port
 */}}
 {{- define "sentry.clickhouse.http_port" -}}
 {{- if .Values.clickhouse.enabled -}}
-{{- default 8123 .Values.clickhouse.clickhouse.http_port }}
+{{- default 8123 .Values.clickhouse.service.ports.http }}
 {{- else -}}
 {{ required "A valid .Values.externalClickhouse.httpPort is required" .Values.externalClickhouse.httpPort }}
 {{- end -}}
@@ -377,11 +377,7 @@ Set ClickHouse User
 */}}
 {{- define "sentry.clickhouse.username" -}}
 {{- if .Values.clickhouse.enabled -}}
-  {{- if .Values.clickhouse.clickhouse.configmap.users.enabled -}}
-{{ (index .Values.clickhouse.clickhouse.configmap.users.user 0).name }}
-  {{- else -}}
-default
-  {{- end -}}
+{{ default "default" .Values.clickhouse.auth.username }}
 {{- else -}}
 {{ required "A valid .Values.externalClickhouse.username is required" .Values.externalClickhouse.username }}
 {{- end -}}
@@ -391,38 +387,22 @@ default
 Set ClickHouse Password
 */}}
 {{- define "sentry.clickhouse.password" -}}
-{{- if .Values.clickhouse.enabled -}}
-  {{- if .Values.clickhouse.clickhouse.configmap.users.enabled -}}
-{{ (index .Values.clickhouse.clickhouse.configmap.users.user 0).config.password }}
-  {{- else -}}
-  {{- end -}}
-{{- else -}}
+{{- if not .Values.clickhouse.enabled -}}
 {{ .Values.externalClickhouse.password }}
-{{- end -}}
+{{- end -}}F
 {{- end -}}
 
 {{/*
 Set ClickHouse cluster name
 */}}
 {{- define "sentry.clickhouse.cluster.name" -}}
 {{- if .Values.clickhouse.enabled -}}
-{{ .Release.Name | printf "%s-clickhouse" }}
+{{ include "clickhouse.headlessServiceName" $.Subcharts.clickhouse }}
 {{- else -}}
 {{ required "A valid .Values.externalClickhouse.clusterName is required" .Values.externalClickhouse.clusterName }}
 {{- end -}}
 {{- end -}}
 
-{{/*
-Set ClickHouse distributed cluster name
-*/}}
-{{- define "sentry.clickhouse.distributed.cluster.name" -}}
-{{- if .Values.clickhouse.enabled -}}
-{{ .Release.Name | printf "%s-clickhouse" }}
-{{- else -}}
-{{ default .Values.externalClickhouse.clusterName .Values.externalClickhouse.distributedClusterName }}
-{{- end -}}
-{{- end -}}
-
 {{/*
 Set ClickHouse secure setting
 */}}
@@ -667,6 +647,15 @@ Set external Clickhouse password from existingSecret
       name: {{ .Values.externalClickhouse.existingSecret }}
       key: {{ default "clickhouse-password" .Values.externalClickhouse.existingSecretKey }}
 {{- end }}
+{{- if not .Values.externalClickhouse.existingSecret }}
+- name: CLICKHOUSE_PASSWORD
+  valueFrom:
+    secretKeyRef:
+      name: {{ include "clickhouse.secretName" $.Subcharts.clickhouse | quote }}
+      key: {{ include "clickhouse.secretKey" $.Subcharts.clickhouse | quote }}
+{{- end }}
+- name: CLICKHOUSE_HOST
+  value: {{ include "sentry.clickhouse.host" . | quote }}
 - name: CLICKHOUSE_MAX_CONNECTIONS
   value: {{ .Values.snuba.clickhouse.maxConnections | quote }}
 {{- if .Values.ipv6 }}

charts/sentry/templates/hooks/sentry-db-check.job.yaml

@@ -13,12 +13,14 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
+  {{- if .Values.asHook }}
   annotations:
     # This is what defines this resource as a hook. Without this line, the
     # job is considered part of the release.
     "helm.sh/hook": "post-install,{{ if .Values.hooks.preUpgrade }}pre-upgrade{{ else }}post-upgrade{{ end }}"
     "helm.sh/hook-delete-policy": "{{ if .Values.hooks.removeOnSuccess }}hook-succeeded,{{ end }}before-hook-creation"
     "helm.sh/hook-weight": "-1"
+  {{- end }}
 spec:
   {{- if .Values.hooks.activeDeadlineSeconds }}
   activeDeadlineSeconds: {{ .Values.hooks.activeDeadlineSeconds }}
@@ -87,26 +89,15 @@ spec:
             CLICKHOUSE_STATUS=0
             while [ $CLICKHOUSE_STATUS -eq 0 ]; do
               CLICKHOUSE_STATUS=1
-              CLICKHOUSE_REPLICAS={{ .Values.clickhouse.enabled | ternary .Values.clickhouse.clickhouse.replicas "1" }}
-              i=0; while [ $i -lt $CLICKHOUSE_REPLICAS ]; do
                 {{- if .Values.clickhouse.enabled }}
-                CLICKHOUSE_HOST={{ $clickhouseHost }}-$i.{{ $clickhouseHost }}-headless
+                CLICKHOUSE_HOST={{ include "clickhouse.headlessServiceName" $.Subcharts.clickhouse }}
                 {{- else }}
                 CLICKHOUSE_HOST={{ .Values.externalClickhouse.host }}
                 {{- end }}
                 if ! nc -z "$CLICKHOUSE_HOST" {{ $clickhousePort }}; then
                   CLICKHOUSE_STATUS=0
                   echo "$CLICKHOUSE_HOST is not available yet"
                 fi
-                {{- if and .Values.clickhouse.enabled .Values.clickhouse.clickhouse.configmap.remote_servers.replica.backup.enabled }}
-                CLICKHOUSE_HOST={{ $clickhouseHost }}-replica-$i.{{ $clickhouseHost }}-replica-headless
-                if ! nc -z "$CLICKHOUSE_HOST" {{ $clickhousePort }}; then
-                  CLICKHOUSE_STATUS=0
-                  echo "$CLICKHOUSE_HOST is not available yet"
-                fi
-                {{- end }}
-                i=$((i+1))
-              done
               if [ "$CLICKHOUSE_STATUS" -eq 0 ]; then
                 echo "Clickhouse not ready. Sleeping for 10s before trying again"
                 sleep 10;

charts/sentry/templates/hooks/sentry-db-init.job.yaml

@@ -8,12 +8,14 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
+  {{- if .Values.asHook }}
   annotations:
     # This is what defines this resource as a hook. Without this line, the
     # job is considered part of the release.
     "helm.sh/hook": "post-install,{{ if .Values.hooks.preUpgrade }}pre-upgrade{{ else }}post-upgrade{{ end }}"
     "helm.sh/hook-delete-policy": "{{ if .Values.hooks.removeOnSuccess }}hook-succeeded,{{ end }}before-hook-creation"
     "helm.sh/hook-weight": "6"
+  {{- end }}
 spec:
   {{- if .Values.hooks.activeDeadlineSeconds }}
   activeDeadlineSeconds: {{ .Values.hooks.activeDeadlineSeconds }}

charts/sentry/templates/hooks/sentry-secret-create.yaml

@@ -8,9 +8,11 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
+  {{- if .Values.asHook }}
   annotations:
     "helm.sh/hook": "pre-install"
     "helm.sh/hook-weight": "3"
+  {{- end }}
 type: Opaque
 data:
   key: {{ randAlphaNum 50 | b64enc | quote }}

charts/sentry/templates/hooks/snuba-db-init.job.yaml

@@ -9,12 +9,14 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
+  {{- if .Values.asHook }}
   annotations:
     # This is what defines this resource as a hook. Without this line, the
     # job is considered part of the release.
     "helm.sh/hook": "post-install,{{ if .Values.hooks.preUpgrade }}pre-upgrade{{ else }}post-upgrade{{ end }}"
     "helm.sh/hook-delete-policy": "{{ if .Values.hooks.removeOnSuccess }}hook-succeeded,{{ end }}before-hook-creation"
     "helm.sh/hook-weight": "3"
+  {{- end }}
 spec:
   {{- if .Values.hooks.activeDeadlineSeconds }}
   activeDeadlineSeconds: {{ .Values.hooks.activeDeadlineSeconds }}

charts/sentry/templates/hooks/snuba-migrate.job.yaml

@@ -9,12 +9,14 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
+  {{- if .Values.asHook }}
   annotations:
     # This is what defines this resource as a hook. Without this line, the
     # job is considered part of the release.
     "helm.sh/hook": "post-install,{{ if .Values.hooks.preUpgrade }}pre-upgrade{{ else }}post-upgrade{{ end }}"
     "helm.sh/hook-delete-policy": "{{ if .Values.hooks.removeOnSuccess }}hook-succeeded,{{ end }}before-hook-creation"
     "helm.sh/hook-weight": "5"
+  {{- end }}
 spec:
   {{- if .Values.hooks.activeDeadlineSeconds }}
   activeDeadlineSeconds: {{ .Values.hooks.activeDeadlineSeconds }}