refactor: move to bitnami chart

Author: TartanLeGrand

.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
 .idea
-
+.vscode
+charts/**/charts/*.tgz

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: 3.14.1
-- name: zookeeper
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 11.4.11
+  version: 9.2.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:2b19e9605468921ff96afb9f393ffe09d3121e5b91f32789e025851f0b66ff63
-generated: "2025-01-17T18:17:43.022337376+06:00"
+digest: sha256:c59bf3784c05e48e5fe9783aa3ee672a76ea1bf66a9692389fdf7cd9fcf7adb0
+generated: "2025-05-15T16:48:18.529896165+02:00"

charts/sentry/Chart.yaml

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

charts/sentry/templates/_helper.tpl

@@ -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.containerPorts.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.containerPorts.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 -}}
+{{- .Values.clickhouse.auth.username }}
 {{- else -}}
 {{ required "A valid .Values.externalClickhouse.username is required" .Values.externalClickhouse.username }}
 {{- end -}}
@@ -392,10 +388,7 @@ 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 -}}
+{{- .Values.clickhouse.auth.password }}
 {{- else -}}
 {{ .Values.externalClickhouse.password }}
 {{- end -}}

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

@@ -87,26 +87,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={{ $clickhouseHost }}-headless
                 {{- 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/snuba/_helper-snuba.tpl

@@ -74,15 +74,7 @@ settings.py: |
         The default clickhouse installation runs in distributed mode, while the external
         clickhouse configured can be configured any way you choose
       */}}
-      {{- if and .Values.externalClickhouse.singleNode (not .Values.clickhouse.enabled) }}
-      "single_node": True,
-      {{- else }}
-      "single_node": False,
-      {{- end }}
-      {{- if or .Values.clickhouse.enabled (not .Values.externalClickhouse.singleNode) }}
-      "cluster_name": {{ include "sentry.clickhouse.cluster.name" . | quote }},
-      "distributed_cluster_name": {{ include "sentry.clickhouse.cluster.name" . | quote }},
-      {{- end }}
+      "single_node": True
     },
   ]
 

charts/sentry/values.yaml

@@ -714,7 +714,7 @@ sentry:
     # noStrictOffsetReset: false
 
   billingMetricsConsumer:
-    enabled: true
+    enabled: false
     replicas: 1
     env: []
     resources: {}
@@ -1253,7 +1253,7 @@ snuba:
     #       medium: Memory
 
   outcomesBillingConsumer:
-    enabled: true
+    enabled: false
     replicas: 1
     env: []
     resources: {}
@@ -2064,7 +2064,7 @@ filestore:
       ##   GKE, AWS & OpenStack)
       ##
       # storageClass: "-"
-      accessMode: ReadWriteOnce  # Set ReadWriteMany for work Replays
+      accessMode: ReadWriteMany
       size: 10Gi
 
       ## Whether to mount the persistent volume to the Sentry worker and
@@ -2075,7 +2075,7 @@ filestore:
       ## Please note that you may need to change your accessMode to ReadWriteMany
       ## if you plan on having the web, worker and cron deployments run on
       ## different nodes.
-      persistentWorkers: false
+      persistentWorkers: true
 
       ## If existingClaim is specified, no PVC will be created and this claim will
       ## be used
@@ -2119,49 +2119,50 @@ config:
     maxWorkerLifetime: 86400
 
 clickhouse:
+  image:
+    tag: 23.8.16-debian-12-r0
   enabled: true
-  nodeSelector: {}
-  # tolerations: []
-  clickhouse:
-    replicas: "1"
-    configmap:
-      remote_servers:
-        internal_replication: true
-        replica:
-          backup:
-            enabled: false
-      zookeeper_servers:
-        enabled: true
-        config:
-          - index: "clickhouse"
-            hostTemplate: "{{ .Release.Name }}-zookeeper-clickhouse"
-            port: "2181"
-      users:
-        enabled: false
-        user:
-          # the first user will be used if enabled
-          - name: default
-            config:
-              password: ""
-              networks:
-                - ::/0
-              profile: default
-              quota: default
-
-    persistentVolumeClaim:
-      enabled: true
-      dataPersistentVolume:
-        enabled: true
-        accessModes:
-          - "ReadWriteOnce"
-        storage: "30Gi"
-
-  ## Use this to enable an extra service account
-  # serviceAccount:
-  #   annotations: {}
-  #   enabled: false
-  #   name: "sentry-clickhouse"
-  #   automountServiceAccountToken: true
+  containerPorts:
+    http: 8123
+    https: 8443
+    tcp: 9000
+  replicaCount: 1
+  shards: 1
+  keeper:
+    replicaCount: 1
+  auth:
+    username: default
+    password: "thePassword"
+  configdFiles:
+    config.xml: |
+      <yandex>
+        <logger>
+          <level>warning</level>
+          <console>true</console>
+        </logger>
+        <query_thread_log remove="remove"/>
+        <query_log remove="remove"/>
+        <text_log remove="remove"/>
+        <trace_log remove="remove"/>
+        <metric_log remove="remove"/>
+        <asynchronous_metric_log remove="remove"/>
+
+        <session_log remove="remove"/>
+        <part_log remove="remove"/>
+
+        <allow_nullable_key>1</allow_nullable_key>
+
+        <profiles>
+          <default>
+            <log_queries>0</log_queries>
+            <log_query_threads>0</log_query_threads>
+          </default>
+        </profiles>
+        <merge_tree>
+          <enable_mixed_granularity_parts>1</enable_mixed_granularity_parts>
+          <max_suspicious_broken_parts>10</max_suspicious_broken_parts>
+        </merge_tree>
+      </yandex>
 
 ## This value is only used when clickhouse.enabled is set to false
 ##
@@ -2184,27 +2185,16 @@ externalClickhouse:
   ##
   # clusterName: test_shard_localhost
 
-# Settings for Zookeeper.
-# See https://github.com/bitnami/charts/tree/master/bitnami/zookeeper
-zookeeper:
-  enabled: true
-  nameOverride: zookeeper-clickhouse
-  replicaCount: 1
-  nodeSelector: {}
-  # tolerations: []
-  ## When increasing the number of exceptions, you need to increase persistence.size
-  # persistence:
-  #   size: 8Gi
-
 # Settings for Kafka.
 # See https://github.com/bitnami/charts/tree/master/bitnami/kafka
 kafka:
   enabled: true
   provisioning:
     ## Increasing the replicationFactor enhances data reliability during Kafka pod failures by replicating data across multiple brokers.
     # Note that existing topics will remain with replicationFactor: 1 when updated.
-    replicationFactor: 3
-    enabled: true
+    replicationFactor: 1
+    parallel: 2
+    enabled: false
     # Topic list is based on files below.
     # - https://github.com/getsentry/snuba/blob/master/snuba/utils/streams/topics.py
     # - https://github.com/getsentry/sentry/blob/master/src/sentry/conf/types/kafka_definition.py
@@ -2352,7 +2342,7 @@ kafka:
   kraft:
     enabled: true
   controller:
-    replicaCount: 3
+    replicaCount: 1
     nodeSelector: {}
     # tolerations: []
     ## if the load on the kafka controller increases, resourcesPreset must be increased
@@ -2421,7 +2411,7 @@ externalKafka:
       ms: 1000
 
 sourcemaps:
-  enabled: false
+  enabled: true
 
 redis:
   enabled: true