Skip to content

Commit 69d5e39

Browse files
sunsingerussunsingerus
authored
Merge pull request #1658 from Altinity/0.24.5
0.24.5
2 parents 5986324 + 2a4b0f2 commit 69d5e39

File tree

67 files changed

+6673
-571
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+6673
-571
lines changed

‎config/config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ clickhouse:
124124
- files/*.xml: "yes"
125125
- files/config.d/*.xml: "yes"
126126
- files/config.d/*dict*.xml: "no"
127+
- files/config.d/*no_restart*: "no"
127128

128129
# exceptions in default profile
129130
- profiles/default/background_*_pool_size: "yes"

‎deploy/builder/templates-config/config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ clickhouse:
118118
- files/*.xml: "yes"
119119
- files/config.d/*.xml: "yes"
120120
- files/config.d/*dict*.xml: "no"
121+
- files/config.d/*no_restart*: "no"
121122

122123
# exceptions in default profile
123124
- profiles/default/background_*_pool_size: "yes"

‎deploy/builder/templates-install-bundle/clickhouse-operator-install-yaml-template-01-section-crd-02-chopconf.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ spec:
137137
items:
138138
type: object
139139
description: "setting: value pairs for configuration restart policy"
140+
x-kubernetes-preserve-unknown-fields: true
140141
access:
141142
type: object
142143
description: "parameters which use for connect to clickhouse from clickhouse-operator deployment"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ description: |-
1313
kubectl apply -f https://github.com/Altinity/clickhouse-operator/raw/master/deploy/helm/clickhouse-operator/crds/CustomResourceDefinition-clickhousekeeperinstallations.clickhouse-keeper.altinity.com.yaml
1414
```
1515
type: application
16-
version: 0.24.4
17-
appVersion: 0.24.4
16+
version: 0.24.5
17+
appVersion: 0.24.5
1818
home: https://github.com/Altinity/clickhouse-operator
1919
icon: https://logosandtypes.com/wp-content/uploads/2020/12/altinity.svg
2020
maintainers:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# altinity-clickhouse-operator
22

3-
![Version: 0.24.4](https://img.shields.io/badge/Version-0.24.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.24.4](https://img.shields.io/badge/AppVersion-0.24.4-informational?style=flat-square)
3+
![Version: 0.24.5](https://img.shields.io/badge/Version-0.24.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.24.5](https://img.shields.io/badge/AppVersion-0.24.5-informational?style=flat-square)
44

55
Helm chart to deploy [altinity-clickhouse-operator](https://github.com/Altinity/clickhouse-operator).
66

‎deploy/helm/clickhouse-operator/crds/CustomResourceDefinition-clickhouseinstallations.clickhouse.altinity.com.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
# SINGULAR=clickhouseinstallation
55
# PLURAL=clickhouseinstallations
66
# SHORT=chi
7-
# OPERATOR_VERSION=0.24.4
7+
# OPERATOR_VERSION=0.24.5
88
#
99
apiVersion: apiextensions.k8s.io/v1
1010
kind: CustomResourceDefinition
1111
metadata:
1212
name: clickhouseinstallations.clickhouse.altinity.com
1313
labels:
14-
clickhouse.altinity.com/chop: 0.24.4
14+
clickhouse.altinity.com/chop: 0.24.5
1515
spec:
1616
group: clickhouse.altinity.com
1717
scope: Namespaced

‎deploy/helm/clickhouse-operator/crds/CustomResourceDefinition-clickhouseinstallationtemplates.clickhouse.altinity.com.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
# SINGULAR=clickhouseinstallationtemplate
55
# PLURAL=clickhouseinstallationtemplates
66
# SHORT=chit
7-
# OPERATOR_VERSION=0.24.4
7+
# OPERATOR_VERSION=0.24.5
88
#
99
apiVersion: apiextensions.k8s.io/v1
1010
kind: CustomResourceDefinition
1111
metadata:
1212
name: clickhouseinstallationtemplates.clickhouse.altinity.com
1313
labels:
14-
clickhouse.altinity.com/chop: 0.24.4
14+
clickhouse.altinity.com/chop: 0.24.5
1515
spec:
1616
group: clickhouse.altinity.com
1717
scope: Namespaced

‎deploy/helm/clickhouse-operator/crds/CustomResourceDefinition-clickhousekeeperinstallations.clickhouse-keeper.altinity.com.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Template Parameters:
22
#
3-
# OPERATOR_VERSION=0.24.4
3+
# OPERATOR_VERSION=0.24.5
44
#
55
apiVersion: apiextensions.k8s.io/v1
66
kind: CustomResourceDefinition
77
metadata:
88
name: clickhousekeeperinstallations.clickhouse-keeper.altinity.com
99
labels:
10-
clickhouse-keeper.altinity.com/chop: 0.24.4
10+
clickhouse-keeper.altinity.com/chop: 0.24.5
1111
spec:
1212
group: clickhouse-keeper.altinity.com
1313
scope: Namespaced

‎deploy/helm/clickhouse-operator/crds/CustomResourceDefinition-clickhouseoperatorconfigurations.clickhouse.altinity.com.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ kind: CustomResourceDefinition
77
metadata:
88
name: clickhouseoperatorconfigurations.clickhouse.altinity.com
99
labels:
10-
clickhouse.altinity.com/chop: 0.24.4
10+
clickhouse.altinity.com/chop: 0.24.5
1111
spec:
1212
group: clickhouse.altinity.com
1313
scope: Namespaced
@@ -137,6 +137,7 @@ spec:
137137
items:
138138
type: object
139139
description: "setting: value pairs for configuration restart policy"
140+
x-kubernetes-preserve-unknown-fields: true
140141
access:
141142
type: object
142143
description: "parameters which use for connect to clickhouse from clickhouse-operator deployment"

‎deploy/helm/clickhouse-operator/files/ClickHouseKeeper_dashboard.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@
600600
"timeFrom": null,
601601
"timeRegions": [],
602602
"timeShift": null,
603-
"title": "Ethermals nodes",
603+
"title": "Ephemeral Node count",
604604
"tooltip": {
605605
"shared": true,
606606
"sort": 0,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
#
33
# NAMESPACE=kube-system
44
# COMMENT=
5-
# OPERATOR_IMAGE=altinity/clickhouse-operator:0.24.4
5+
# OPERATOR_IMAGE=altinity/clickhouse-operator:0.24.5
66
# OPERATOR_IMAGE_PULL_POLICY=Always
7-
# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.24.4
7+
# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.24.5
88
# METRICS_EXPORTER_IMAGE_PULL_POLICY=Always
99
#
1010
# Setup Deployment for clickhouse-operator

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Template parameters available:
44
# NAMESPACE=kube-system
55
# COMMENT=
6-
# OPERATOR_VERSION=0.24.4
6+
# OPERATOR_VERSION=0.24.5
77
# CH_USERNAME_SECRET_PLAIN=clickhouse_operator
88
# CH_PASSWORD_SECRET_PLAIN=clickhouse_operator_password
99
#

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,7 @@ configs:
294294
- files/*.xml: "yes"
295295
- files/config.d/*.xml: "yes"
296296
- files/config.d/*dict*.xml: "no"
297+
- files/config.d/*no_restart*: "no"
297298
# exceptions in default profile
298299
- profiles/default/background_*_pool_size: "yes"
299300
- profiles/default/max_*_for_server: "yes"

‎deploy/operator/clickhouse-operator-install-ansible.yaml

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
# SINGULAR=clickhouseinstallation
1212
# PLURAL=clickhouseinstallations
1313
# SHORT=chi
14-
# OPERATOR_VERSION=0.24.4
14+
# OPERATOR_VERSION=0.24.5
1515
#
1616
apiVersion: apiextensions.k8s.io/v1
1717
kind: CustomResourceDefinition
1818
metadata:
1919
name: clickhouseinstallations.clickhouse.altinity.com
2020
labels:
21-
clickhouse.altinity.com/chop: 0.24.4
21+
clickhouse.altinity.com/chop: 0.24.5
2222
spec:
2323
group: clickhouse.altinity.com
2424
scope: Namespaced
@@ -1293,14 +1293,14 @@ spec:
12931293
# SINGULAR=clickhouseinstallationtemplate
12941294
# PLURAL=clickhouseinstallationtemplates
12951295
# SHORT=chit
1296-
# OPERATOR_VERSION=0.24.4
1296+
# OPERATOR_VERSION=0.24.5
12971297
#
12981298
apiVersion: apiextensions.k8s.io/v1
12991299
kind: CustomResourceDefinition
13001300
metadata:
13011301
name: clickhouseinstallationtemplates.clickhouse.altinity.com
13021302
labels:
1303-
clickhouse.altinity.com/chop: 0.24.4
1303+
clickhouse.altinity.com/chop: 0.24.5
13041304
spec:
13051305
group: clickhouse.altinity.com
13061306
scope: Namespaced
@@ -2578,7 +2578,7 @@ kind: CustomResourceDefinition
25782578
metadata:
25792579
name: clickhouseoperatorconfigurations.clickhouse.altinity.com
25802580
labels:
2581-
clickhouse.altinity.com/chop: 0.24.4
2581+
clickhouse.altinity.com/chop: 0.24.5
25822582
spec:
25832583
group: clickhouse.altinity.com
25842584
scope: Namespaced
@@ -2708,6 +2708,7 @@ spec:
27082708
items:
27092709
type: object
27102710
description: "setting: value pairs for configuration restart policy"
2711+
x-kubernetes-preserve-unknown-fields: true
27112712
access:
27122713
type: object
27132714
description: "parameters which use for connect to clickhouse from clickhouse-operator deployment"
@@ -3027,14 +3028,14 @@ spec:
30273028
---
30283029
# Template Parameters:
30293030
#
3030-
# OPERATOR_VERSION=0.24.4
3031+
# OPERATOR_VERSION=0.24.5
30313032
#
30323033
apiVersion: apiextensions.k8s.io/v1
30333034
kind: CustomResourceDefinition
30343035
metadata:
30353036
name: clickhousekeeperinstallations.clickhouse-keeper.altinity.com
30363037
labels:
3037-
clickhouse-keeper.altinity.com/chop: 0.24.4
3038+
clickhouse-keeper.altinity.com/chop: 0.24.5
30383039
spec:
30393040
group: clickhouse-keeper.altinity.com
30403041
scope: Namespaced
@@ -3890,7 +3891,7 @@ metadata:
38903891
name: clickhouse-operator
38913892
namespace: {{ namespace }}
38923893
labels:
3893-
clickhouse.altinity.com/chop: 0.24.4
3894+
clickhouse.altinity.com/chop: 0.24.5
38943895
---
38953896
# Template Parameters:
38963897
#
@@ -3916,7 +3917,7 @@ metadata:
39163917
name: clickhouse-operator
39173918
namespace: {{ namespace }}
39183919
labels:
3919-
clickhouse.altinity.com/chop: 0.24.4
3920+
clickhouse.altinity.com/chop: 0.24.5
39203921
rules:
39213922

39223923
#
@@ -4135,7 +4136,7 @@ metadata:
41354136
name: clickhouse-operator
41364137
namespace: {{ namespace }}
41374138
labels:
4138-
clickhouse.altinity.com/chop: 0.24.4
4139+
clickhouse.altinity.com/chop: 0.24.5
41394140
roleRef:
41404141
apiGroup: rbac.authorization.k8s.io
41414142
kind: Role
@@ -4157,7 +4158,7 @@ metadata:
41574158
name: etc-clickhouse-operator-files
41584159
namespace: {{ namespace }}
41594160
labels:
4160-
clickhouse.altinity.com/chop: 0.24.4
4161+
clickhouse.altinity.com/chop: 0.24.5
41614162
app: clickhouse-operator
41624163
data:
41634164
config.yaml: |
@@ -4287,6 +4288,7 @@ data:
42874288
- files/*.xml: "yes"
42884289
- files/config.d/*.xml: "yes"
42894290
- files/config.d/*dict*.xml: "no"
4291+
- files/config.d/*no_restart*: "no"
42904292
42914293
# exceptions in default profile
42924294
- profiles/default/background_*_pool_size: "yes"
@@ -4580,7 +4582,7 @@ metadata:
45804582
name: etc-clickhouse-operator-confd-files
45814583
namespace: {{ namespace }}
45824584
labels:
4583-
clickhouse.altinity.com/chop: 0.24.4
4585+
clickhouse.altinity.com/chop: 0.24.5
45844586
app: clickhouse-operator
45854587
data:
45864588
---
@@ -4596,7 +4598,7 @@ metadata:
45964598
name: etc-clickhouse-operator-configd-files
45974599
namespace: {{ namespace }}
45984600
labels:
4599-
clickhouse.altinity.com/chop: 0.24.4
4601+
clickhouse.altinity.com/chop: 0.24.5
46004602
app: clickhouse-operator
46014603
data:
46024604
01-clickhouse-01-listen.xml: |
@@ -4695,7 +4697,7 @@ metadata:
46954697
name: etc-clickhouse-operator-templatesd-files
46964698
namespace: {{ namespace }}
46974699
labels:
4698-
clickhouse.altinity.com/chop: 0.24.4
4700+
clickhouse.altinity.com/chop: 0.24.5
46994701
app: clickhouse-operator
47004702
data:
47014703
001-templates.json.example: |
@@ -4795,7 +4797,7 @@ metadata:
47954797
name: etc-clickhouse-operator-usersd-files
47964798
namespace: {{ namespace }}
47974799
labels:
4798-
clickhouse.altinity.com/chop: 0.24.4
4800+
clickhouse.altinity.com/chop: 0.24.5
47994801
app: clickhouse-operator
48004802
data:
48014803
01-clickhouse-operator-profile.xml: |
@@ -4858,7 +4860,7 @@ metadata:
48584860
name: etc-keeper-operator-confd-files
48594861
namespace: {{ namespace }}
48604862
labels:
4861-
clickhouse.altinity.com/chop: 0.24.4
4863+
clickhouse.altinity.com/chop: 0.24.5
48624864
app: clickhouse-operator
48634865
data:
48644866
---
@@ -4874,7 +4876,7 @@ metadata:
48744876
name: etc-keeper-operator-configd-files
48754877
namespace: {{ namespace }}
48764878
labels:
4877-
clickhouse.altinity.com/chop: 0.24.4
4879+
clickhouse.altinity.com/chop: 0.24.5
48784880
app: clickhouse-operator
48794881
data:
48804882
01-keeper-01-default-config.xml: |
@@ -4952,7 +4954,7 @@ metadata:
49524954
name: etc-keeper-operator-templatesd-files
49534955
namespace: {{ namespace }}
49544956
labels:
4955-
clickhouse.altinity.com/chop: 0.24.4
4957+
clickhouse.altinity.com/chop: 0.24.5
49564958
app: clickhouse-operator
49574959
data:
49584960
readme: |
@@ -4970,15 +4972,15 @@ metadata:
49704972
name: etc-keeper-operator-usersd-files
49714973
namespace: {{ namespace }}
49724974
labels:
4973-
clickhouse.altinity.com/chop: 0.24.4
4975+
clickhouse.altinity.com/chop: 0.24.5
49744976
app: clickhouse-operator
49754977
data:
49764978
---
49774979
#
49784980
# Template parameters available:
49794981
# NAMESPACE={{ namespace }}
49804982
# COMMENT=
4981-
# OPERATOR_VERSION=0.24.4
4983+
# OPERATOR_VERSION=0.24.5
49824984
# CH_USERNAME_SECRET_PLAIN=clickhouse_operator
49834985
# CH_PASSWORD_SECRET_PLAIN={{ password }}
49844986
#
@@ -4988,7 +4990,7 @@ metadata:
49884990
name: clickhouse-operator
49894991
namespace: {{ namespace }}
49904992
labels:
4991-
clickhouse.altinity.com/chop: 0.24.4
4993+
clickhouse.altinity.com/chop: 0.24.5
49924994
app: clickhouse-operator
49934995
type: Opaque
49944996
stringData:
@@ -4999,9 +5001,9 @@ stringData:
49995001
#
50005002
# NAMESPACE={{ namespace }}
50015003
# COMMENT=
5002-
# OPERATOR_IMAGE=altinity/clickhouse-operator:0.24.4
5004+
# OPERATOR_IMAGE=altinity/clickhouse-operator:0.24.5
50035005
# OPERATOR_IMAGE_PULL_POLICY=Always
5004-
# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.24.4
5006+
# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.24.5
50055007
# METRICS_EXPORTER_IMAGE_PULL_POLICY=Always
50065008
#
50075009
# Setup Deployment for clickhouse-operator
@@ -5012,7 +5014,7 @@ metadata:
50125014
name: clickhouse-operator
50135015
namespace: {{ namespace }}
50145016
labels:
5015-
clickhouse.altinity.com/chop: 0.24.4
5017+
clickhouse.altinity.com/chop: 0.24.5
50165018
app: clickhouse-operator
50175019
spec:
50185020
replicas: 1
@@ -5060,7 +5062,7 @@ spec:
50605062
name: etc-keeper-operator-usersd-files
50615063
containers:
50625064
- name: clickhouse-operator
5063-
image: altinity/clickhouse-operator:0.24.4
5065+
image: altinity/clickhouse-operator:0.24.5
50645066
imagePullPolicy: Always
50655067
volumeMounts:
50665068
- name: etc-clickhouse-operator-folder
@@ -5136,7 +5138,7 @@ spec:
51365138
name: metrics
51375139

51385140
- name: metrics-exporter
5139-
image: altinity/metrics-exporter:0.24.4
5141+
image: altinity/metrics-exporter:0.24.5
51405142
imagePullPolicy: Always
51415143
volumeMounts:
51425144
- name: etc-clickhouse-operator-folder
@@ -5227,7 +5229,7 @@ metadata:
52275229
name: clickhouse-operator-metrics
52285230
namespace: {{ namespace }}
52295231
labels:
5230-
clickhouse.altinity.com/chop: 0.24.4
5232+
clickhouse.altinity.com/chop: 0.24.5
52315233
app: clickhouse-operator
52325234
spec:
52335235
ports:

0 commit comments

Comments
 (0)