Merge pull request #1583 from Altinity/0.24.2

0.24.2
Altinity · Dec 5, 2024 · 9db470f · 9db470f
2 parents adab0c8 + 932c34e
commit 9db470f
Show file tree

Hide file tree

Showing 34 changed files with 5,901 additions and 415 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,6 +20,7 @@
 log
 *.log
 *.log.txt
+tests/report_*.html
 __pycache__
 
 # Skip dev runtime-produced

diff --git a/config/chk/keeper_config.d/01-keeper-01-default-config.xml b/config/chk/keeper_config.d/01-keeper-01-default-config.xml
@@ -26,16 +26,4 @@
         <level>information</level>
     </logger>
     <max_connections>4096</max_connections>
-    <openSSL>
-        <server>
-            <cacheSessions>true</cacheSessions>
-            <certificateFile>/etc/clickhouse-keeper/server.crt</certificateFile>
-            <dhParamsFile>/etc/clickhouse-keeper/dhparam.pem</dhParamsFile>
-            <disableProtocols>sslv2,sslv3</disableProtocols>
-            <loadDefaultCAFile>true</loadDefaultCAFile>
-            <preferServerCiphers>true</preferServerCiphers>
-            <privateKeyFile>/etc/clickhouse-keeper/server.key</privateKeyFile>
-            <verificationMode>none</verificationMode>
-        </server>
-    </openSSL>
 </clickhouse>
diff --git a/deploy/builder/templates-config/chk/keeper_config.d/01-keeper-01-default-config.xml b/deploy/builder/templates-config/chk/keeper_config.d/01-keeper-01-default-config.xml
@@ -20,16 +20,4 @@
         <level>information</level>
     </logger>
     <max_connections>4096</max_connections>
-    <openSSL>
-        <server>
-            <cacheSessions>true</cacheSessions>
-            <certificateFile>/etc/clickhouse-keeper/server.crt</certificateFile>
-            <dhParamsFile>/etc/clickhouse-keeper/dhparam.pem</dhParamsFile>
-            <disableProtocols>sslv2,sslv3</disableProtocols>
-            <loadDefaultCAFile>true</loadDefaultCAFile>
-            <preferServerCiphers>true</preferServerCiphers>
-            <privateKeyFile>/etc/clickhouse-keeper/server.key</privateKeyFile>
-            <verificationMode>none</verificationMode>
-        </server>
-    </openSSL>
 </clickhouse>
diff --git a/deploy/helm/clickhouse-operator/Chart.yaml b/deploy/helm/clickhouse-operator/Chart.yaml
@@ -13,8 +13,8 @@ description: |-
     kubectl apply -f https://github.com/Altinity/clickhouse-operator/raw/master/deploy/helm/clickhouse-operator/crds/CustomResourceDefinition-clickhousekeeperinstallations.clickhouse-keeper.altinity.com.yaml
   ```
 type: application
-version: 0.24.1
-appVersion: 0.24.1
+version: 0.24.2
+appVersion: 0.24.2
 home: https://github.com/Altinity/clickhouse-operator
 icon: https://logosandtypes.com/wp-content/uploads/2020/12/altinity.svg
 maintainers:

diff --git a/deploy/helm/clickhouse-operator/README.md b/deploy/helm/clickhouse-operator/README.md
@@ -1,6 +1,6 @@
 # altinity-clickhouse-operator
 
-![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)
+![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)
 
 Helm chart to deploy [altinity-clickhouse-operator](https://github.com/Altinity/clickhouse-operator).
 

diff --git a/...erator/crds/CustomResourceDefinition-clickhouseinstallations.clickhouse.altinity.com.yaml b/...erator/crds/CustomResourceDefinition-clickhouseinstallations.clickhouse.altinity.com.yaml
@@ -4,14 +4,14 @@
 # SINGULAR=clickhouseinstallation
 # PLURAL=clickhouseinstallations
 # SHORT=chi
-# OPERATOR_VERSION=0.24.1
+# OPERATOR_VERSION=0.24.2
 #
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: clickhouseinstallations.clickhouse.altinity.com
   labels:
-    clickhouse.altinity.com/chop: 0.24.1
+    clickhouse.altinity.com/chop: 0.24.2
 spec:
   group: clickhouse.altinity.com
   scope: Namespaced

diff --git a/...rds/CustomResourceDefinition-clickhouseinstallationtemplates.clickhouse.altinity.com.yaml b/...rds/CustomResourceDefinition-clickhouseinstallationtemplates.clickhouse.altinity.com.yaml
@@ -4,14 +4,14 @@
 # SINGULAR=clickhouseinstallationtemplate
 # PLURAL=clickhouseinstallationtemplates
 # SHORT=chit
-# OPERATOR_VERSION=0.24.1
+# OPERATOR_VERSION=0.24.2
 #
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: clickhouseinstallationtemplates.clickhouse.altinity.com
   labels:
-    clickhouse.altinity.com/chop: 0.24.1
+    clickhouse.altinity.com/chop: 0.24.2
 spec:
   group: clickhouse.altinity.com
   scope: Namespaced

diff --git a/...ustomResourceDefinition-clickhousekeeperinstallations.clickhouse-keeper.altinity.com.yaml b/...ustomResourceDefinition-clickhousekeeperinstallations.clickhouse-keeper.altinity.com.yaml
@@ -1,13 +1,13 @@
 # Template Parameters:
 #
-# OPERATOR_VERSION=0.24.1
+# OPERATOR_VERSION=0.24.2
 #
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: clickhousekeeperinstallations.clickhouse-keeper.altinity.com
   labels:
-    clickhouse-keeper.altinity.com/chop: 0.24.1
+    clickhouse-keeper.altinity.com/chop: 0.24.2
 spec:
   group: clickhouse-keeper.altinity.com
   scope: Namespaced

diff --git a/...ds/CustomResourceDefinition-clickhouseoperatorconfigurations.clickhouse.altinity.com.yaml b/...ds/CustomResourceDefinition-clickhouseoperatorconfigurations.clickhouse.altinity.com.yaml
@@ -7,7 +7,7 @@ kind: CustomResourceDefinition
 metadata:
   name: clickhouseoperatorconfigurations.clickhouse.altinity.com
   labels:
-    clickhouse.altinity.com/chop: 0.24.1
+    clickhouse.altinity.com/chop: 0.24.2
 spec:
   group: clickhouse.altinity.com
   scope: Namespaced

diff --git a/deploy/helm/clickhouse-operator/templates/generated/Deployment-clickhouse-operator.yaml b/deploy/helm/clickhouse-operator/templates/generated/Deployment-clickhouse-operator.yaml
@@ -2,9 +2,9 @@
 #
 # NAMESPACE=kube-system
 # COMMENT=
-# OPERATOR_IMAGE=altinity/clickhouse-operator:0.24.1
+# OPERATOR_IMAGE=altinity/clickhouse-operator:0.24.2
 # OPERATOR_IMAGE_PULL_POLICY=Always
-# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.24.1
+# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.24.2
 # METRICS_EXPORTER_IMAGE_PULL_POLICY=Always
 #
 # Setup Deployment for clickhouse-operator

diff --git a/deploy/helm/clickhouse-operator/templates/generated/Secret-clickhouse-operator.yaml b/deploy/helm/clickhouse-operator/templates/generated/Secret-clickhouse-operator.yaml
@@ -3,7 +3,7 @@
 # Template parameters available:
 #   NAMESPACE=kube-system
 #   COMMENT=
-#   OPERATOR_VERSION=0.24.1
+#   OPERATOR_VERSION=0.24.2
 #   CH_USERNAME_SECRET_PLAIN=clickhouse_operator
 #   CH_PASSWORD_SECRET_PLAIN=clickhouse_operator_password
 #

diff --git a/deploy/helm/clickhouse-operator/values.yaml b/deploy/helm/clickhouse-operator/values.yaml
@@ -712,18 +712,6 @@ configs:
               <level>information</level>
           </logger>
           <max_connections>4096</max_connections>
-          <openSSL>
-              <server>
-                  <cacheSessions>true</cacheSessions>
-                  <certificateFile>/etc/clickhouse-keeper/server.crt</certificateFile>
-                  <dhParamsFile>/etc/clickhouse-keeper/dhparam.pem</dhParamsFile>
-                  <disableProtocols>sslv2,sslv3</disableProtocols>
-                  <loadDefaultCAFile>true</loadDefaultCAFile>
-                  <preferServerCiphers>true</preferServerCiphers>
-                  <privateKeyFile>/etc/clickhouse-keeper/server.key</privateKeyFile>
-                  <verificationMode>none</verificationMode>
-              </server>
-          </openSSL>
       </clickhouse>
     01-keeper-02-readiness.xml: |
       <!-- IMPORTANT -->