Skip to content

Commit 6b2788b

Browse files
sunsingerussunsingerus
authored
Merge pull request #1532 from Altinity/0.24.0
Helm chart fix
2 parents 3eb3120 + 2a829e9 commit 6b2788b

9 files changed

+30
-29
lines changed

‎deploy/helm/clickhouse-operator/README.md‎

Lines changed: 1 addition & 2 deletions
Large diffs are not rendered by default.

‎deploy/helm/clickhouse-operator/templates/generated/ConfigMap-etc-keeper-operator-confd-files.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
apiVersion: v1
88
kind: ConfigMap
99
metadata:
10-
name: {{ printf "%s-etc-keeper-operator-confd-files" (include "altinity-clickhouse-operator.fullname" .) }}
10+
name: {{ printf "%s-keeper-confd-files" (include "altinity-clickhouse-operator.fullname" .) }}
1111
namespace: {{ .Release.Namespace }}
1212
labels: {{ include "altinity-clickhouse-operator.labels" . | nindent 4 }}
13-
data: {{ include "altinity-clickhouse-operator.configmap-data" (list . .Values.configs.etcKeeperOperatorConfdFiles) | nindent 2 }}
13+
data: {{ include "altinity-clickhouse-operator.configmap-data" (list . .Values.configs.keeperConfdFiles) | nindent 2 }}

‎deploy/helm/clickhouse-operator/templates/generated/ConfigMap-etc-keeper-operator-configd-files.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
apiVersion: v1
88
kind: ConfigMap
99
metadata:
10-
name: {{ printf "%s-etc-keeper-operator-configd-files" (include "altinity-clickhouse-operator.fullname" .) }}
10+
name: {{ printf "%s-keeper-configd-files" (include "altinity-clickhouse-operator.fullname" .) }}
1111
namespace: {{ .Release.Namespace }}
1212
labels: {{ include "altinity-clickhouse-operator.labels" . | nindent 4 }}
13-
data: {{ include "altinity-clickhouse-operator.configmap-data" (list . .Values.configs.etcKeeperOperatorConfigdFiles) | nindent 2 }}
13+
data: {{ include "altinity-clickhouse-operator.configmap-data" (list . .Values.configs.keeperConfigdFiles) | nindent 2 }}

‎deploy/helm/clickhouse-operator/templates/generated/ConfigMap-etc-keeper-operator-templatesd-files.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
apiVersion: v1
88
kind: ConfigMap
99
metadata:
10-
name: {{ printf "%s-etc-keeper-operator-templatesd-files" (include "altinity-clickhouse-operator.fullname" .) }}
10+
name: {{ printf "%s-keeper-templatesd-files" (include "altinity-clickhouse-operator.fullname" .) }}
1111
namespace: {{ .Release.Namespace }}
1212
labels: {{ include "altinity-clickhouse-operator.labels" . | nindent 4 }}
13-
data: {{ include "altinity-clickhouse-operator.configmap-data" (list . .Values.configs.etcKeeperOperatorTemplatesdFiles) | nindent 2 }}
13+
data: {{ include "altinity-clickhouse-operator.configmap-data" (list . .Values.configs.keeperTemplatesdFiles) | nindent 2 }}

‎deploy/helm/clickhouse-operator/templates/generated/ConfigMap-etc-keeper-operator-usersd-files.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
apiVersion: v1
88
kind: ConfigMap
99
metadata:
10-
name: {{ printf "%s-etc-keeper-operator-usersd-files" (include "altinity-clickhouse-operator.fullname" .) }}
10+
name: {{ printf "%s-keeper-usersd-files" (include "altinity-clickhouse-operator.fullname" .) }}
1111
namespace: {{ .Release.Namespace }}
1212
labels: {{ include "altinity-clickhouse-operator.labels" . | nindent 4 }}
13-
data: {{ include "altinity-clickhouse-operator.configmap-data" (list . .Values.configs.etcKeeperOperatorUsersdFiles) | nindent 2 }}
13+
data: {{ include "altinity-clickhouse-operator.configmap-data" (list . .Values.configs.keeperUsersdFiles) | nindent 2 }}

‎deploy/helm/clickhouse-operator/templates/generated/Deployment-clickhouse-operator.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ spec:
2929
checksum/configd-files: {{ include (print $.Template.BasePath "/generated/ConfigMap-etc-clickhouse-operator-configd-files.yaml") . | sha256sum }}
3030
checksum/templatesd-files: {{ include (print $.Template.BasePath "/generated/ConfigMap-etc-clickhouse-operator-templatesd-files.yaml") . | sha256sum }}
3131
checksum/usersd-files: {{ include (print $.Template.BasePath "/generated/ConfigMap-etc-clickhouse-operator-usersd-files.yaml") . | sha256sum }}
32-
checksum/etc-keeper-operator-confd-files: {{ include (print $.Template.BasePath "/generated/ConfigMap-etc-clickhouse-operator-etc-keeper-operator-confd-files.yaml") . | sha256sum }}
33-
checksum/etc-keeper-operator-configd-files: {{ include (print $.Template.BasePath "/generated/ConfigMap-etc-clickhouse-operator-etc-keeper-operator-configd-files.yaml") . | sha256sum }}
34-
checksum/etc-keeper-operator-templatesd-files: {{ include (print $.Template.BasePath "/generated/ConfigMap-etc-clickhouse-operator-etc-keeper-operator-templatesd-files.yaml") . | sha256sum }}
35-
checksum/etc-keeper-operator-usersd-files: {{ include (print $.Template.BasePath "/generated/ConfigMap-etc-clickhouse-operator-etc-keeper-operator-usersd-files.yaml") . | sha256sum }}
32+
checksum/keeper-confd-files: {{ include (print $.Template.BasePath "/generated/ConfigMap-etc-keeper-operator-confd-files.yaml") . | sha256sum }}
33+
checksum/keeper-configd-files: {{ include (print $.Template.BasePath "/generated/ConfigMap-etc-keeper-operator-configd-files.yaml") . | sha256sum }}
34+
checksum/keeper-templatesd-files: {{ include (print $.Template.BasePath "/generated/ConfigMap-etc-keeper-operator-templatesd-files.yaml") . | sha256sum }}
35+
checksum/keeper-usersd-files: {{ include (print $.Template.BasePath "/generated/ConfigMap-etc-keeper-operator-usersd-files.yaml") . | sha256sum }}
3636
spec:
3737
serviceAccountName: {{ include "altinity-clickhouse-operator.serviceAccountName" . }}
3838
volumes:
@@ -53,16 +53,16 @@ spec:
5353
name: {{ include "altinity-clickhouse-operator.fullname" . }}-usersd-files
5454
- name: etc-keeper-operator-confd-folder
5555
configMap:
56-
name: etc-keeper-operator-confd-files
56+
name: {{ include "altinity-clickhouse-operator.fullname" . }}-keeper-confd-files
5757
- name: etc-keeper-operator-configd-folder
5858
configMap:
59-
name: etc-keeper-operator-configd-files
59+
name: {{ include "altinity-clickhouse-operator.fullname" . }}-keeper-configd-files
6060
- name: etc-keeper-operator-templatesd-folder
6161
configMap:
62-
name: etc-keeper-operator-templatesd-files
62+
name: {{ include "altinity-clickhouse-operator.fullname" . }}-keeper-templatesd-files
6363
- name: etc-keeper-operator-usersd-folder
6464
configMap:
65-
name: etc-keeper-operator-usersd-files
65+
name: {{ include "altinity-clickhouse-operator.fullname" . }}-keeper-usersd-files
6666
containers:
6767
- name: {{ .Chart.Name }}
6868
image: {{ .Values.operator.image.repository }}:{{ include "altinity-clickhouse-operator.operator.tag" . }}

‎deploy/helm/clickhouse-operator/templates/generated/ServiceAccount-clickhouse-operator.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ metadata:
1313
namespace: {{ .Release.Namespace }}
1414
labels: {{ include "altinity-clickhouse-operator.labels" . | nindent 4 }}
1515
annotations: {{ toYaml .Values.serviceAccount.annotations | nindent 4 }}
16-
1716
# Template Parameters:
1817
#
1918
# NAMESPACE=kube-system

‎deploy/helm/clickhouse-operator/values.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -697,8 +697,8 @@ configs:
697697
</default>
698698
</profiles>
699699
</yandex>
700-
etcKeeperOperatorConfdFiles: null
701-
etcKeeperOperatorConfigdFiles:
700+
keeperConfdFiles: null
701+
keeperConfigdFiles:
702702
01-keeper-01-default-config.xml: |
703703
<!-- IMPORTANT -->
704704
<!-- This file is auto-generated -->
@@ -759,10 +759,10 @@ configs:
759759
</http_control>
760760
</keeper_server>
761761
</clickhouse>
762-
etcKeeperOperatorTemplatesdFiles:
762+
keeperTemplatesdFiles:
763763
readme: |-
764764
Templates in this folder are packaged with an operator and available via 'useTemplate'
765-
etcKeeperOperatorUsersdFiles: null
765+
keeperUsersdFiles: null
766766
# additionalResources -- list of additional resources to create (are processed via `tpl` function), useful for create ClickHouse clusters together with clickhouse-operator, look `kubectl explain chi` for details
767767

768768
additionalResources: []

‎dev/generate_helm_chart.sh‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,11 @@ function update_deployment_resource() {
200200
for cm in $(yq e '.spec.template.spec.volumes[].configMap.name' "${file}"); do
201201
local prefix='{{ include \"altinity-clickhouse-operator.fullname\" . }}'
202202
local newCm="${cm/etc-clickhouse-operator/$prefix}"
203+
newCm="${newCm/etc-keeper-operator/${prefix}-keeper}"
203204
yq e -i '(.spec.template.spec.volumes[].configMap.name | select(. == "'"${cm}"'") | .) |= "'"${newCm}"'"' "${file}"
204205
local cmName="${cm/etc-clickhouse-operator-/}"
205-
yq e -i '.spec.template.metadata.annotations += {"checksum/'"${cmName}"'": "{{ include (print $.Template.BasePath \"/generated/ConfigMap-etc-clickhouse-operator-'"${cmName}"'.yaml\") . | sha256sum }}"}' "${file}"
206+
cmName="${cmName/etc-keeper-operator-/keeper-}"
207+
yq e -i '.spec.template.metadata.annotations += {"checksum/'"${cmName}"'": "{{ include (print $.Template.BasePath \"/generated/ConfigMap-'"${cm}"'.yaml\") . | sha256sum }}"}' "${file}"
206208
done
207209

208210
yq e -i '.spec.template.spec.containers[0].name |= "{{ .Chart.Name }}"' "${file}"
@@ -245,18 +247,19 @@ function update_configmap_resource() {
245247
fi
246248

247249
local name_suffix="${name/etc-clickhouse-operator-/}"
248-
local cameled_name
249-
cameled_name=$(to_camel_case "${name_suffix}")
250+
local name_suffix="${name_suffix/etc-keeper-operator-/keeper-}"
251+
local camel_cased_name
252+
camel_cased_name=$(to_camel_case "${name_suffix}")
250253

251254
yq e -i '.metadata.name |= "{{ printf \"%s-'"${name_suffix}"'\" (include \"altinity-clickhouse-operator.fullname\" .) }}"' "${file}"
252255
yq e -i '.metadata.namespace |= "{{ .Release.Namespace }}"' "${file}"
253256
yq e -i '.metadata.labels |= "{{ include \"altinity-clickhouse-operator.labels\" . | nindent 4 }}"' "${file}"
254-
yq e -i '.data |= "{{ include \"altinity-clickhouse-operator.configmap-data\" (list . .Values.configs.'"${cameled_name}"') | nindent 2 }}"' "${file}"
257+
yq e -i '.data |= "{{ include \"altinity-clickhouse-operator.configmap-data\" (list . .Values.configs.'"${camel_cased_name}"') | nindent 2 }}"' "${file}"
255258

256259
if [ -z "${data}" ]; then
257-
yq e -i '.configs.'"${cameled_name}"' |= null' "${values_yaml}"
260+
yq e -i '.configs.'"${camel_cased_name}"' |= null' "${values_yaml}"
258261
else
259-
data_arg="${data}" yq e -i '.configs.'"${cameled_name}"' |= env(data_arg)' "${values_yaml}"
262+
data_arg="${data}" yq e -i '.configs.'"${camel_cased_name}"' |= env(data_arg)' "${values_yaml}"
260263
fi
261264

262265
perl -pi -e "s/'//g" "${file}"

0 commit comments

Comments
 (0)