RetroSearch Browse

Home - News ( United States | United Kingdom | Italy | Germany ) - Football scores

Showing content from https://github.com/Altinity/clickhouse-operator/commit/2a829e92385f7e886d3a8fcdbe45d97657be1368 below:

Merge pull request #1531 from Altinity/fix_helm_release · Altinity/clickhouse-operator@2a829e9 · GitHub

File tree Expand file treeCollapse file tree 9 files changed

+30

-29

lines changed

Filter options

deploy/helm/clickhouse-operator

Expand file treeCollapse file tree 9 files changed

+30

-29

lines changed Original file line number Diff line number Diff line change


 @@ -7,7 +7,7 @@

7 7


 apiVersion: v1

8 8


 kind: ConfigMap

9 9


 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" .) }}

11 11


 namespace: {{ .Release.Namespace }}

12 12


 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 }}

Original file line number Diff line number Diff line change


 @@ -7,7 +7,7 @@

7 7


 apiVersion: v1

8 8


 kind: ConfigMap

9 9


 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" .) }}

11 11


 namespace: {{ .Release.Namespace }}

12 12


 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 }}

Original file line number Diff line number Diff line change


 @@ -7,7 +7,7 @@

7 7


 apiVersion: v1

8 8


 kind: ConfigMap

9 9


 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" .) }}

11 11


 namespace: {{ .Release.Namespace }}

12 12


 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 }}

Original file line number Diff line number Diff line change


 @@ -7,7 +7,7 @@

7 7


 apiVersion: v1

8 8


 kind: ConfigMap

9 9


 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" .) }}

11 11


 namespace: {{ .Release.Namespace }}

12 12


 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 }}

Original file line number Diff line number Diff line change


 @@ -29,10 +29,10 @@ spec:

29 29


 checksum/configd-files: {{ include (print $.Template.BasePath "/generated/ConfigMap-etc-clickhouse-operator-configd-files.yaml") . | sha256sum }}

30 30


 checksum/templatesd-files: {{ include (print $.Template.BasePath "/generated/ConfigMap-etc-clickhouse-operator-templatesd-files.yaml") . | sha256sum }}

31 31


 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 }}

36 36


 spec:

37 37


 serviceAccountName: {{ include "altinity-clickhouse-operator.serviceAccountName" . }}

38 38


 volumes:


 @@ -53,16 +53,16 @@ spec:

53 53


 name: {{ include "altinity-clickhouse-operator.fullname" . }}-usersd-files

54 54


 - name: etc-keeper-operator-confd-folder

55 55


 configMap:

56

-
 name: etc-keeper-operator-confd-files

56

+
 name: {{ include "altinity-clickhouse-operator.fullname" . }}-keeper-confd-files

57 57


 - name: etc-keeper-operator-configd-folder

58 58


 configMap:

59

-
 name: etc-keeper-operator-configd-files

59

+
 name: {{ include "altinity-clickhouse-operator.fullname" . }}-keeper-configd-files

60 60


 - name: etc-keeper-operator-templatesd-folder

61 61


 configMap:

62

-
 name: etc-keeper-operator-templatesd-files

62

+
 name: {{ include "altinity-clickhouse-operator.fullname" . }}-keeper-templatesd-files

63 63


 - name: etc-keeper-operator-usersd-folder

64 64


 configMap:

65

-
 name: etc-keeper-operator-usersd-files

65

+
 name: {{ include "altinity-clickhouse-operator.fullname" . }}-keeper-usersd-files

66 66


 containers:

67 67


 - name: {{ .Chart.Name }}

68 68


 image: {{ .Values.operator.image.repository }}:{{ include "altinity-clickhouse-operator.operator.tag" . }}

Original file line number Diff line number Diff line change


 @@ -13,7 +13,6 @@ metadata:

13 13


 namespace: {{ .Release.Namespace }}

14 14


 labels: {{ include "altinity-clickhouse-operator.labels" . | nindent 4 }}

15 15


 annotations: {{ toYaml .Values.serviceAccount.annotations | nindent 4 }}

16 - 17 16


 # Template Parameters:

18 17

19 18


 # NAMESPACE=kube-system

Original file line number Diff line number Diff line change


 @@ -697,8 +697,8 @@ configs:

697 697


  </default>

698 698


  </profiles>

699 699


  </yandex>

700

-
  etcKeeperOperatorConfdFiles: null

701

-
 etcKeeperOperatorConfigdFiles:

700

+
  keeperConfdFiles: null

701

+
 keeperConfigdFiles:

702 702


 01-keeper-01-default-config.xml: |

703 703


  <!-- IMPORTANT -->

704 704


  <!-- This file is auto-generated -->


 @@ -759,10 +759,10 @@ configs:

759 759


  </http_control>

760 760


  </keeper_server>

761 761


  </clickhouse>

762

-
  etcKeeperOperatorTemplatesdFiles:

762

+
  keeperTemplatesdFiles:

763 763


 readme: |-

764 764


  Templates in this folder are packaged with an operator and available via 'useTemplate'

765

-
  etcKeeperOperatorUsersdFiles: null

765

+
  keeperUsersdFiles: null

766 766


 # 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

767 767 768 768


 additionalResources: []

Original file line number Diff line number Diff line change


 @@ -200,9 +200,11 @@ function update_deployment_resource() {

200 200


 for cm in $(yq e '.spec.template.spec.volumes[].configMap.name' "${file}"); do

201 201


 local prefix='{{ include \"altinity-clickhouse-operator.fullname\" . }}'

202 202


 local newCm="${cm/etc-clickhouse-operator/$prefix}"

203

+
 newCm="${newCm/etc-keeper-operator/${prefix}-keeper}"

203 204


 yq e -i '(.spec.template.spec.volumes[].configMap.name | select(. == "'"${cm}"'") | .) |= "'"${newCm}"'"' "${file}"

204 205


 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}"

206 208


 done

207 209 208 210


 yq e -i '.spec.template.spec.containers[0].name |= "{{ .Chart.Name }}"' "${file}"


 @@ -245,18 +247,19 @@ function update_configmap_resource() {

245 247

fi

246 248 247 249


 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}")

250 253 251 254


 yq e -i '.metadata.name |= "{{ printf \"%s-'"${name_suffix}"'\" (include \"altinity-clickhouse-operator.fullname\" .) }}"' "${file}"

252 255


 yq e -i '.metadata.namespace |= "{{ .Release.Namespace }}"' "${file}"

253 256


 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}"

255 258 256 259


 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}"

258 261


 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}"

260 263

fi

261 264 262 265


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

You can’t perform that action at this time.

RetroSearch is an open source project built by @garambo | Open a GitHub Issue

Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo

HTML: 3.2 | Encoding: UTF-8 | Version: 0.7.4