Skip to content

Commit 4334428

Browse files
mzglinskimzglinski
authored
chore!: remove bundled clickhouse chart (#2029)
1 parent 1092a3c commit 4334428

File tree

13 files changed

+24
-180
lines changed

13 files changed

+24
-180
lines changed

‎README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ For now the full list of values is not documented, but you can get inspired by t
2020

2121
## Upgrading to Chart 29.x.x
2222

23+
## External ClickHouse
24+
25+
Removed bundled ClickHouse. Use an external ClickHouse deployment and follow the [External ClickHouse guide](charts/sentry/docs/external-clickhouse.md).
26+
2327
### Memcached chart switch
2428

2529
This release replaces the Bitnami Memcached dependency with the CloudPirates Memcached chart (`oci://registry-1.docker.io/cloudpirates/memcached`). Values have changed accordingly:

‎charts/clickhouse/Chart.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,4 @@ name: clickhouse
1313
sources:
1414
- https://github.com/sentry-kubernetes/charts
1515
version: 4.1.1
16-
maintainers:
17-
- name: sentry-kubernetes
16+
deprecated: true

‎charts/clickhouse/README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
[ClickHouse](https://clickhouse.yandex/) is an open source column-oriented database management system capable of real time generation of analytical data reports using SQL queries.
44

5+
## Deprecation Notice
6+
7+
This chart is deprecated and will not receive further updates in this repository. For Sentry deployments, use an external ClickHouse cluster and follow the [External ClickHouse guide](../sentry/docs/external-clickhouse.md).
8+
59
## Introduction
610
This chart bootstraps a [ClickHouse](https://clickhouse.yandex/) replication cluster deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager.
711

‎charts/sentry/Chart.lock‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,11 @@ dependencies:
88
- name: kafka
99
repository: oci://registry-1.docker.io/bitnamicharts
1010
version: 29.3.14
11-
- name: clickhouse
12-
repository: https://sentry-kubernetes.github.io/charts
13-
version: 4.1.1
14-
- name: zookeeper
15-
repository: oci://registry-1.docker.io/bitnamicharts
16-
version: 11.4.11
1711
- name: postgresql
1812
repository: oci://registry-1.docker.io/bitnamicharts
1913
version: 12.5.1
2014
- name: nginx
2115
repository: oci://registry-1.docker.io/bitnamicharts
2216
version: 22.3.9
23-
digest: sha256:421e258cff10d78a00f0b353e21e1e42834f4f1aa5d1880468c0738e04568501
24-
generated: "2026-01-21T15:30:56.019590047+01:00"
17+
digest: sha256:3fe0b2d43a3db134b6df02bf1afb57c5e1e6012fb2786f0487e334c3d836ec88
18+
generated: "2026-02-03T11:05:38.208270483+01:00"

‎charts/sentry/Chart.yaml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,6 @@ dependencies:
1818
repository: oci://registry-1.docker.io/bitnamicharts
1919
version: 29.3.14
2020
condition: kafka.enabled
21-
- name: clickhouse
22-
repository: https://sentry-kubernetes.github.io/charts
23-
version: 4.1.1
24-
condition: clickhouse.enabled
25-
- name: zookeeper
26-
repository: oci://registry-1.docker.io/bitnamicharts
27-
version: 11.4.11
28-
condition: zookeeper.enabled
2921
- name: postgresql
3022
repository: oci://registry-1.docker.io/bitnamicharts
3123
version: 12.5.1

‎charts/sentry/README.md‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -41,24 +41,6 @@ Note: this table is incomplete, so have a look at the values.yaml in case you mi
4141
|-----|------|---------|-------------|
4242
| asHook | bool | `true` | |
4343
| auth.register | bool | `true` | |
44-
| clickhouse.clickhouse.configmap.remote_servers.internal_replication | bool | `true` | |
45-
| clickhouse.clickhouse.configmap.remote_servers.replica.backup.enabled | bool | `false` | |
46-
| clickhouse.clickhouse.configmap.users.enabled | bool | `false` | |
47-
| clickhouse.clickhouse.configmap.users.user[0].config.networks[0] | string | `"::/0"` | |
48-
| clickhouse.clickhouse.configmap.users.user[0].config.password | string | `""` | |
49-
| clickhouse.clickhouse.configmap.users.user[0].config.profile | string | `"default"` | |
50-
| clickhouse.clickhouse.configmap.users.user[0].config.quota | string | `"default"` | |
51-
| clickhouse.clickhouse.configmap.users.user[0].name | string | `"default"` | |
52-
| clickhouse.clickhouse.configmap.zookeeper_servers.config[0].hostTemplate | string | `"{{ .Release.Name }}-zookeeper-clickhouse"` | |
53-
| clickhouse.clickhouse.configmap.zookeeper_servers.config[0].index | string | `"clickhouse"` | |
54-
| clickhouse.clickhouse.configmap.zookeeper_servers.config[0].port | string | `"2181"` | |
55-
| clickhouse.clickhouse.configmap.zookeeper_servers.enabled | bool | `true` | |
56-
| clickhouse.clickhouse.persistentVolumeClaim.dataPersistentVolume.accessModes[0] | string | `"ReadWriteOnce"` | |
57-
| clickhouse.clickhouse.persistentVolumeClaim.dataPersistentVolume.enabled | bool | `true` | |
58-
| clickhouse.clickhouse.persistentVolumeClaim.dataPersistentVolume.storage | string | `"30Gi"` | |
59-
| clickhouse.clickhouse.persistentVolumeClaim.enabled | bool | `true` | |
60-
| clickhouse.clickhouse.replicas | string | `"1"` | |
61-
| clickhouse.enabled | bool | `true` | |
6244
| clickhouse.nodeSelector | object | `{}` | |
6345
| config.configYml | object | `{}` | |
6446
| config.relay | string | `"# No YAML relay config given\n"` | |
@@ -1163,10 +1145,6 @@ Note: this table is incomplete, so have a look at the values.yaml in case you mi
11631145
| vroom.persistence.accessModes[0] | string | `"ReadWriteOnce"` | Access mode for vroom PVC. Use ReadWriteMany if sharing with ingest-profiles (filestore.profiles.filesystem.persistence.shareWithVroom) |
11641146
| vroom.persistence.size | string | `"10Gi"` | Size of vroom PVC |
11651147
| vroom.persistence.storageClassName | string | `nil` | Storage class for vroom PVC |
1166-
| zookeeper.enabled | bool | `true` | |
1167-
| zookeeper.nameOverride | string | `"zookeeper-clickhouse"` | |
1168-
| zookeeper.nodeSelector | object | `{}` | |
1169-
| zookeeper.replicaCount | int | `1` | |
11701148

11711149
## NGINX and/or Ingress
11721150

‎charts/sentry/ci/kind-values.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ redis:
2020
rabbitmq:
2121
enabled: false
2222

23-
clickhouse:
24-
enabled: false
25-
2623
externalClickhouse:
2724
host: "clickhouse-clickhouse-external.default.svc"
2825
tcpPort: 9000

‎charts/sentry/docs/external-clickhouse.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,6 @@ Once your ClickHouse cluster is running, configure the Sentry Helm chart to use
124124
In your `values.yaml`:
125125

126126
```yaml
127-
# Disable the bundled ClickHouse
128-
clickhouse:
129-
enabled: false
130-
131127
externalClickhouse:
132128
host: "clickhouse-sentry-clickhouse.sentry.svc" # Service name of your CHI
133129
tcpPort: 9000

‎charts/sentry/docs/external-services.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ This guide outlines how to configure the various external services required by S
88

99
**Status: REQUIRED**
1010

11-
The bundled ClickHouse chart is deprecated. You must provide an external ClickHouse endpoint.
11+
The bundled ClickHouse chart has been removed. You must provide an external ClickHouse endpoint.
1212

1313
- [ClickHouse Setup Guide](external-clickhouse.md)
1414

‎charts/sentry/templates/_helper.tpl‎

Lines changed: 3 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -188,10 +188,6 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
188188
{{- end -}}
189189
{{- end -}}
190190

191-
{{- define "sentry.clickhouse.fullname" -}}
192-
{{- printf "%s-%s" .Release.Name "clickhouse" | trunc 63 | trimSuffix "-" -}}
193-
{{- end -}}
194-
195191
{{- define "sentry.kafka.fullname" -}}
196192
{{- printf "%s-%s" .Release.Name "kafka" | trunc 63 | trimSuffix "-" -}}
197193
{{- end -}}
@@ -365,102 +361,63 @@ Create the name of the service account to use
365361
Set ClickHouse host
366362
*/}}
367363
{{- define "sentry.clickhouse.host" -}}
368-
{{- if .Values.clickhouse.enabled -}}
369-
{{- template "sentry.clickhouse.fullname" . -}}
370-
{{- else -}}
371364
{{ required "A valid .Values.externalClickhouse.host is required" .Values.externalClickhouse.host }}
372365
{{- end -}}
373-
{{- end -}}
374366

375367
{{/*
376368
Set ClickHouse port
377369
*/}}
378370
{{- define "sentry.clickhouse.port" -}}
379-
{{- if .Values.clickhouse.enabled -}}
380-
{{- default 9000 .Values.clickhouse.clickhouse.tcp_port }}
381-
{{- else -}}
382371
{{ required "A valid .Values.externalClickhouse.tcpPort is required" .Values.externalClickhouse.tcpPort }}
383372
{{- end -}}
384-
{{- end -}}
385373

386374
{{/*
387375
Set ClickHouse HTTP port
388376
*/}}
389377
{{- define "sentry.clickhouse.http_port" -}}
390-
{{- if .Values.clickhouse.enabled -}}
391-
{{- default 8123 .Values.clickhouse.clickhouse.http_port }}
392-
{{- else -}}
393378
{{ required "A valid .Values.externalClickhouse.httpPort is required" .Values.externalClickhouse.httpPort }}
394379
{{- end -}}
395-
{{- end -}}
396380

397381
{{/*
398382
Set ClickHouse Database
399383
*/}}
400384
{{- define "sentry.clickhouse.database" -}}
401-
{{- if .Values.clickhouse.enabled -}}
402-
default
403-
{{- else -}}
404385
{{ required "A valid .Values.externalClickhouse.database is required" .Values.externalClickhouse.database }}
405386
{{- end -}}
406-
{{- end -}}
407387

408388
{{/*
409389
Set ClickHouse User
410390
*/}}
411391
{{- define "sentry.clickhouse.username" -}}
412-
{{- if .Values.clickhouse.enabled -}}
413-
{{- if .Values.clickhouse.clickhouse.configmap.users.enabled -}}
414-
{{ (index .Values.clickhouse.clickhouse.configmap.users.user 0).name }}
415-
{{- else -}}
416-
default
417-
{{- end -}}
418-
{{- else -}}
419392
{{ required "A valid .Values.externalClickhouse.username is required" .Values.externalClickhouse.username }}
420393
{{- end -}}
421-
{{- end -}}
422394

423395
{{/*
424396
Set ClickHouse Password
425397
*/}}
426398
{{- define "sentry.clickhouse.password" -}}
427-
{{- if .Values.clickhouse.enabled -}}
428-
{{- if .Values.clickhouse.clickhouse.configmap.users.enabled -}}
429-
{{ (index .Values.clickhouse.clickhouse.configmap.users.user 0).config.password }}
430-
{{- else -}}
431-
{{- end -}}
432-
{{- else -}}
433399
{{ .Values.externalClickhouse.password }}
434400
{{- end -}}
435-
{{- end -}}
436401

437402
{{/*
438403
Set ClickHouse cluster name
439404
*/}}
440405
{{- define "sentry.clickhouse.cluster.name" -}}
441-
{{- if .Values.clickhouse.enabled -}}
442-
{{ .Release.Name | printf "%s-clickhouse" }}
443-
{{- else -}}
444406
{{ required "A valid .Values.externalClickhouse.clusterName is required" .Values.externalClickhouse.clusterName }}
445407
{{- end -}}
446-
{{- end -}}
447408

448409
{{/*
449410
Set ClickHouse distributed cluster name
450411
*/}}
451412
{{- define "sentry.clickhouse.distributed.cluster.name" -}}
452-
{{- if .Values.clickhouse.enabled -}}
453-
{{ .Release.Name | printf "%s-clickhouse" }}
454-
{{- else -}}
455413
{{ default .Values.externalClickhouse.clusterName .Values.externalClickhouse.distributedClusterName }}
456414
{{- end -}}
457-
{{- end -}}
458415

459416
{{/*
460417
Set ClickHouse secure setting
461418
*/}}
462419
{{- define "sentry.clickhouse.secure" -}}
463-
{{- if and (.Values.externalClickhouse.enabled) (.Values.externalClickhouse.secure) -}}
420+
{{- if .Values.externalClickhouse.secure -}}
464421
True
465422
{{- end -}}
466423
{{- end -}}
@@ -469,7 +426,7 @@ True
469426
Set ClickHouse ca_certs setting
470427
*/}}
471428
{{- define "sentry.clickhouse.ca_certs" -}}
472-
{{- if and (.Values.externalClickhouse.enabled) (.Values.externalClickhouse.ca_certs) -}}
429+
{{- if .Values.externalClickhouse.ca_certs -}}
473430
{{ .Values.externalClickhouse.ca_certs }}
474431
{{- end -}}
475432
{{- end -}}
@@ -478,7 +435,7 @@ Set ClickHouse ca_certs setting
478435
Set ClickHouse verify ca setting
479436
*/}}
480437
{{- define "sentry.clickhouse.verify" -}}
481-
{{- if and (.Values.externalClickhouse.enabled) (.Values.externalClickhouse.verify) -}}
438+
{{- if .Values.externalClickhouse.verify -}}
482439
True
483440
{{- end -}}
484441
{{- end -}}

0 commit comments

Comments
 (0)