Skip to content

Commit 9db470f

Browse files
authored
Merge pull request #1583 from Altinity/0.24.2
0.24.2
2 parents adab0c8 + 932c34e commit 9db470f

File tree

34 files changed

+5901
-415
lines changed

34 files changed

+5901
-415
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
log
2121
*.log
2222
*.log.txt
23+
tests/report_*.html
2324
__pycache__
2425

2526
# Skip dev runtime-produced

config/chk/keeper_config.d/01-keeper-01-default-config.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,4 @@
2626
<level>information</level>
2727
</logger>
2828
<max_connections>4096</max_connections>
29-
<openSSL>
30-
<server>
31-
<cacheSessions>true</cacheSessions>
32-
<certificateFile>/etc/clickhouse-keeper/server.crt</certificateFile>
33-
<dhParamsFile>/etc/clickhouse-keeper/dhparam.pem</dhParamsFile>
34-
<disableProtocols>sslv2,sslv3</disableProtocols>
35-
<loadDefaultCAFile>true</loadDefaultCAFile>
36-
<preferServerCiphers>true</preferServerCiphers>
37-
<privateKeyFile>/etc/clickhouse-keeper/server.key</privateKeyFile>
38-
<verificationMode>none</verificationMode>
39-
</server>
40-
</openSSL>
4129
</clickhouse>

deploy/builder/templates-config/chk/keeper_config.d/01-keeper-01-default-config.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,4 @@
2020
<level>information</level>
2121
</logger>
2222
<max_connections>4096</max_connections>
23-
<openSSL>
24-
<server>
25-
<cacheSessions>true</cacheSessions>
26-
<certificateFile>/etc/clickhouse-keeper/server.crt</certificateFile>
27-
<dhParamsFile>/etc/clickhouse-keeper/dhparam.pem</dhParamsFile>
28-
<disableProtocols>sslv2,sslv3</disableProtocols>
29-
<loadDefaultCAFile>true</loadDefaultCAFile>
30-
<preferServerCiphers>true</preferServerCiphers>
31-
<privateKeyFile>/etc/clickhouse-keeper/server.key</privateKeyFile>
32-
<verificationMode>none</verificationMode>
33-
</server>
34-
</openSSL>
3523
</clickhouse>

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.1
17-
appVersion: 0.24.1
16+
version: 0.24.2
17+
appVersion: 0.24.2
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.1](https://img.shields.io/badge/Version-0.24.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.24.1](https://img.shields.io/badge/AppVersion-0.24.1-informational?style=flat-square)
3+
![Version: 0.24.2](https://img.shields.io/badge/Version-0.24.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.24.2](https://img.shields.io/badge/AppVersion-0.24.2-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.1
7+
# OPERATOR_VERSION=0.24.2
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.1
14+
clickhouse.altinity.com/chop: 0.24.2
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.1
7+
# OPERATOR_VERSION=0.24.2
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.1
14+
clickhouse.altinity.com/chop: 0.24.2
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.1
3+
# OPERATOR_VERSION=0.24.2
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.1
10+
clickhouse-keeper.altinity.com/chop: 0.24.2
1111
spec:
1212
group: clickhouse-keeper.altinity.com
1313
scope: Namespaced

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

Lines changed: 1 addition & 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.1
10+
clickhouse.altinity.com/chop: 0.24.2
1111
spec:
1212
group: clickhouse.altinity.com
1313
scope: Namespaced

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.1
5+
# OPERATOR_IMAGE=altinity/clickhouse-operator:0.24.2
66
# OPERATOR_IMAGE_PULL_POLICY=Always
7-
# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.24.1
7+
# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.24.2
88
# METRICS_EXPORTER_IMAGE_PULL_POLICY=Always
99
#
1010
# Setup Deployment for clickhouse-operator

0 commit comments

Comments
 (0)