Skip to content

Commit e639359

Browse files
joshleecreatesjoshleecreates
authored
v0.2.6 (#46)
* Update operator version * add support for service account creation resolves #41 * Fixes logVolumeClaimTemplate usage resolves #44 * allows for a cluster secret to be created or defined. Resolves #42 * [clickhouse] v0.2.6 version bump
1 parent 128e438 commit e639359

File tree

8 files changed

+90
-8
lines changed

8 files changed

+90
-8
lines changed

‎Makefile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ docs:
1313
helm-docs charts/clickhouse-keeper-sts --template-files=templates/README.md.gotmpl
1414
helm-docs charts/keeper-sts --template-files=templates/README.md.gotmpl
1515
# Trim whitespace from generated README files
16-
find charts -name "README.md" -exec sed -i '' -e '1,2{/^[[:space:]]*$$/d;}' -e 's/[[:space:]]*$$//' {} \;
16+
for file in $$(find charts -name "README.md"); do \
17+
sed -i -e '1,2{/^[[:space:]]*$$/d;}' -e 's/[[:space:]]*$$//' "$$file"; \
18+
done
1719

1820
verify:
1921
${REPO_ROOT}/scripts/validate.sh

‎charts/clickhouse/Chart.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies:
22
- name: altinity-clickhouse-operator
33
repository: https://docs.altinity.com/clickhouse-operator
4-
version: 0.24.3
5-
digest: sha256:b94131a88dd2045295643ffb85cd0c84c723e86c0513df7308c527e19ee80cc2
6-
generated: "2025-01-28T13:19:50.741222228+01:00"
4+
version: 0.25.2
5+
digest: sha256:baaefed641447864a2e78270a19cfc3667071f2ebbaca3d40e4f3293b30be015
6+
generated: "2025-07-17T15:27:54.494193-04:00"

‎charts/clickhouse/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ apiVersion: v2
22
name: clickhouse
33
description: A Helm chart for creating a ClickHouse® Cluster with the Altinity Operator for ClickHouse
44
type: application
5-
version: 0.2.5
5+
version: 0.2.6
66
appVersion: "24.8.14.10459"
77

88
dependencies:
99
- name: altinity-clickhouse-operator
1010
repository: https://docs.altinity.com/clickhouse-operator
11-
version: 0.24.3
11+
version: 0.25.2
1212
alias: operator
1313
condition: operator.enabled

‎charts/clickhouse/README.md‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# clickhouse
2-
![Version: 0.2.5](https://img.shields.io/badge/Version-0.2.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 24.8.14.10459](https://img.shields.io/badge/AppVersion-24.8.14.10459-informational?style=flat-square)
2+
![Version: 0.2.6](https://img.shields.io/badge/Version-0.2.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 24.8.14.10459](https://img.shields.io/badge/AppVersion-24.8.14.10459-informational?style=flat-square)
33

44
A Helm chart for creating a ClickHouse® Cluster with the Altinity Operator for ClickHouse
55

@@ -15,7 +15,7 @@ A Helm chart for creating a ClickHouse® Cluster with the Altinity Operator for
1515

1616
| Repository | Name | Version |
1717
|------------|------|---------|
18-
| https://docs.altinity.com/clickhouse-operator | operator(altinity-clickhouse-operator) | 0.24.3 |
18+
| https://docs.altinity.com/clickhouse-operator | operator(altinity-clickhouse-operator) | 0.25.2 |
1919

2020
## Installing the Chart
2121

@@ -132,6 +132,13 @@ EOSQL
132132
| Key | Type | Default | Description |
133133
|-----|------|---------|-------------|
134134
| clickhouse.antiAffinity | bool | `false` | |
135+
| clickhouse.clusterSecret | object | `{"auto":true,"enabled":false,"value":"","valueFrom":{"secretKeyRef":{"key":"secret","name":""}}}` | Cluster secret configuration for secure inter-node communication |
136+
| clickhouse.clusterSecret.auto | bool | `true` | Auto-generate cluster secret (recommended for security) |
137+
| clickhouse.clusterSecret.enabled | bool | `false` | Whether to enable secure cluster communication |
138+
| clickhouse.clusterSecret.value | string | `""` | Plaintext cluster secret value (not recommended for production) |
139+
| clickhouse.clusterSecret.valueFrom | object | `{"secretKeyRef":{"key":"secret","name":""}}` | Reference to an existing Kubernetes secret containing the cluster secret |
140+
| clickhouse.clusterSecret.valueFrom.secretKeyRef.key | string | `"secret"` | Key in the secret that contains the cluster secret value |
141+
| clickhouse.clusterSecret.valueFrom.secretKeyRef.name | string | `""` | Name of the secret containing the cluster secret |
135142
| clickhouse.defaultUser.allowExternalAccess | bool | `false` | Allow the default user to access ClickHouse from any IP. If set, will override `hostIP` to always be `0.0.0.0/0`. |
136143
| clickhouse.defaultUser.hostIP | string | `"127.0.0.1/32"` | |
137144
| clickhouse.defaultUser.password | string | `""` | |
@@ -162,6 +169,9 @@ EOSQL
162169
| clickhouse.service.serviceAnnotations | object | `{}` | |
163170
| clickhouse.service.serviceLabels | object | `{}` | |
164171
| clickhouse.service.type | string | `"ClusterIP"` | |
172+
| clickhouse.serviceAccount.annotations | object | `{}` | Annotations to add to the service account |
173+
| clickhouse.serviceAccount.create | bool | `false` | Specifies whether a service account should be created |
174+
| clickhouse.serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template |
165175
| clickhouse.shardsCount | int | `1` | number of shards. |
166176
| clickhouse.zones | list | `[]` | |
167177
| keeper.enabled | bool | `false` | Whether to enable Keeper. Required for replicated tables. |

‎charts/clickhouse/templates/_helpers.tpl‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ Pod Template Base
7777
imagePullSecrets:
7878
{{- toYaml . | nindent 12 }}
7979
{{- end }}
80+
{{- if or .Values.clickhouse.serviceAccount.create .Values.clickhouse.serviceAccount.name }}
81+
serviceAccountName: {{ include "clickhouse.serviceAccountName" . }}
82+
{{- end }}
8083
securityContext:
8184
{{- toYaml .Values.clickhouse.podSecurityContext | nindent 12 }}
8285
containers:
@@ -218,3 +221,14 @@ Selector labels
218221
app.kubernetes.io/name: {{ include "clickhouse.name" . }}
219222
app.kubernetes.io/instance: {{ .Release.Name }}
220223
{{- end }}
224+
225+
{{/*
226+
Create the name of the service account to use
227+
*/}}
228+
{{- define "clickhouse.serviceAccountName" -}}
229+
{{- if .Values.clickhouse.serviceAccount.create }}
230+
{{- default (include "clickhouse.fullname" .) .Values.clickhouse.serviceAccount.name }}
231+
{{- else }}
232+
{{- default "default" .Values.clickhouse.serviceAccount.name }}
233+
{{- end }}
234+
{{- end }}

‎charts/clickhouse/templates/chi.yaml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,19 @@ spec:
1717
{{- if .Values.clickhouse.persistence.enabled }}
1818
dataVolumeClaimTemplate: {{ include "clickhouse.volumeClaimTemplateName" . }}
1919
{{- end }}
20+
{{- if .Values.clickhouse.persistence.logs.enabled }}
21+
logVolumeClaimTemplate: {{ include "clickhouse.logsVolumeClaimTemplateName" . }}
22+
{{- end }}
2023
useTemplates:
2124
- name: {{ $service_name }}
2225
{{- if .Values.clickhouse.lbService.enabled }}
2326
- name: {{ $service_name }}-lb
2427
{{- end }}
2528
- name: {{ include "clickhouse.podTemplateName" . }}
2629
- name: {{ include "clickhouse.volumeClaimTemplateName" . }}
30+
{{- if .Values.clickhouse.persistence.logs.enabled }}
31+
- name: {{ include "clickhouse.logsVolumeClaimTemplateName" . }}
32+
{{- end }}
2733
{{- if not (empty .Values.clickhouse.zones) -}}
2834
{{- $originalContext := . -}}
2935
{{- range .Values.clickhouse.zones }}
@@ -44,6 +50,20 @@ spec:
4450
key: password
4551
clusters:
4652
- name: {{ include "clickhouse.clustername" . }}
53+
{{- if .Values.clickhouse.clusterSecret.enabled }}
54+
secure: "yes"
55+
secret:
56+
{{- if .Values.clickhouse.clusterSecret.auto }}
57+
auto: "true"
58+
{{- else if .Values.clickhouse.clusterSecret.value }}
59+
value: {{ .Values.clickhouse.clusterSecret.value | quote }}
60+
{{- else if .Values.clickhouse.clusterSecret.valueFrom.secretKeyRef.name }}
61+
valueFrom:
62+
secretKeyRef:
63+
name: {{ .Values.clickhouse.clusterSecret.valueFrom.secretKeyRef.name | quote }}
64+
key: {{ .Values.clickhouse.clusterSecret.valueFrom.secretKeyRef.key | quote }}
65+
{{- end }}
66+
{{- end }}
4767
layout:
4868
{{- if (empty .Values.clickhouse.zones) }}
4969
shardsCount: {{ .Values.clickhouse.shardsCount | default 1 }}

‎charts/clickhouse/templates/serviceaccount.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{{- if .Values.clickhouse.serviceAccount.create -}}
2+
apiVersion: v1
3+
kind: ServiceAccount
4+
metadata:
5+
name: {{ include "clickhouse.serviceAccountName" . }}
6+
labels:
7+
{{- include "clickhouse.labels" . | nindent 4 }}
8+
{{- with .Values.clickhouse.serviceAccount.annotations }}
9+
annotations:
10+
{{- toYaml . | nindent 4 }}
11+
{{- end }}
12+
{{- end }}

‎charts/clickhouse/values.yaml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,22 @@ clickhouse:
2424
# -- number of shards.
2525
shardsCount: 1
2626

27+
# -- Cluster secret configuration for secure inter-node communication
28+
clusterSecret:
29+
# -- Whether to enable secure cluster communication
30+
enabled: false
31+
# -- Auto-generate cluster secret (recommended for security)
32+
auto: true
33+
# -- Plaintext cluster secret value (not recommended for production)
34+
value: ""
35+
# -- Reference to an existing Kubernetes secret containing the cluster secret
36+
valueFrom:
37+
secretKeyRef:
38+
# -- Name of the secret containing the cluster secret
39+
name: ""
40+
# -- Key in the secret that contains the cluster secret value
41+
key: "secret"
42+
2743
# Specify which zones to run in.
2844
# `replicaCount` will applied within each zone.
2945
zones: []
@@ -75,6 +91,14 @@ clickhouse:
7591
# @ignore
7692
imagePullSecrets: []
7793

94+
serviceAccount:
95+
# -- Specifies whether a service account should be created
96+
create: false
97+
# -- Annotations to add to the service account
98+
annotations: {}
99+
# -- The name of the service account to use.
100+
# If not set and create is true, a name is generated using the fullname template
101+
name: ""
78102

79103
podAnnotations: {}
80104
podLabels: {}

0 commit comments

Comments
 (0)