Merge pull request #1292 from Altinity/0.22.2

0.22.2 to master
Altinity · Dec 14, 2023 · b0dc549 · b0dc549
2 parents 111d7ef + c02531f
commit b0dc549
Show file tree

Hide file tree

Showing 27 changed files with 4,626 additions and 139 deletions.
diff --git a/config/config.yaml b/config/config.yaml
@@ -106,6 +106,7 @@ clickhouse:
 
  - zookeeper/*: "yes"
 
+ - files/*.xml: "yes"
  - files/config.d/*.xml: "yes"
  - files/config.d/*dict*.xml: "no"
 

diff --git a/config/users.d/02-clickhouse-default-profile.xml b/config/users.d/02-clickhouse-default-profile.xml
@@ -14,6 +14,8 @@
  <parallel_view_processing>1</parallel_view_processing>
  <do_not_merge_across_partitions_select_final>1</do_not_merge_across_partitions_select_final>
  <load_balancing>nearest_hostname</load_balancing>
+ <prefer_localhost_replica>0</prefer_localhost_replica>
+ <!-- materialize_ttl_recalculate_only>1</materialize_ttl_recalculate_only> 21.10 and above -->
  </default>
  </profiles>
 </yandex>
diff --git a/deploy/builder/templates-config/config.yaml b/deploy/builder/templates-config/config.yaml
@@ -100,6 +100,7 @@ clickhouse:
 
  - zookeeper/*: "yes"
 
+ - files/*.xml: "yes"
  - files/config.d/*.xml: "yes"
  - files/config.d/*dict*.xml: "no"
 

diff --git a/deploy/builder/templates-config/users.d/02-clickhouse-default-profile.xml b/deploy/builder/templates-config/users.d/02-clickhouse-default-profile.xml
@@ -8,6 +8,8 @@
  <parallel_view_processing>1</parallel_view_processing>
  <do_not_merge_across_partitions_select_final>1</do_not_merge_across_partitions_select_final>
  <load_balancing>nearest_hostname</load_balancing>
+ <prefer_localhost_replica>0</prefer_localhost_replica>
+ <!-- materialize_ttl_recalculate_only>1</materialize_ttl_recalculate_only> 21.10 and above -->
  </default>
  </profiles>
 </yandex>
diff --git a/deploy/helm/Chart.yaml b/deploy/helm/Chart.yaml
@@ -12,8 +12,8 @@ description: |-
  kubectl apply -f https://github.com/Altinity/clickhouse-operator/raw/master/deploy/helm/crds/CustomResourceDefinition-clickhouseoperatorconfigurations.clickhouse.altinity.com.yaml
  ```
 type: application
-version: 0.22.1
-appVersion: 0.22.1
+version: 0.22.2
+appVersion: 0.22.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/README.md b/deploy/helm/README.md
@@ -1,6 +1,6 @@
 # altinity-clickhouse-operator
 
-![Version: 0.22.1](https://img.shields.io/badge/Version-0.22.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.22.1](https://img.shields.io/badge/AppVersion-0.22.1-informational?style=flat-square)
+![Version: 0.22.2](https://img.shields.io/badge/Version-0.22.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.22.2](https://img.shields.io/badge/AppVersion-0.22.2-informational?style=flat-square)
 
 Helm chart to deploy [altinity-clickhouse-operator](https://github.com/Altinity/clickhouse-operator).
 

diff --git a/...y/helm/crds/CustomResourceDefinition-clickhouseinstallations.clickhouse.altinity.com.yaml b/...y/helm/crds/CustomResourceDefinition-clickhouseinstallations.clickhouse.altinity.com.yaml
@@ -4,14 +4,14 @@
 # SINGULAR=clickhouseinstallation
 # PLURAL=clickhouseinstallations
 # SHORT=chi
-# OPERATOR_VERSION=0.22.1
+# OPERATOR_VERSION=0.22.2
 #
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  name: clickhouseinstallations.clickhouse.altinity.com
  labels:
- clickhouse.altinity.com/chop: 0.22.1
+ clickhouse.altinity.com/chop: 0.22.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.22.1
+# OPERATOR_VERSION=0.22.2
 #
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  name: clickhouseinstallationtemplates.clickhouse.altinity.com
  labels:
- clickhouse.altinity.com/chop: 0.22.1
+ clickhouse.altinity.com/chop: 0.22.2
 spec:
  group: clickhouse.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.22.1
+ clickhouse.altinity.com/chop: 0.22.2
 spec:
  group: clickhouse.altinity.com
  scope: Namespaced

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

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

diff --git a/deploy/helm/templates/servicemonitor.yaml b/deploy/helm/templates/servicemonitor.yaml
@@ -2,7 +2,7 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
- name: {{ include "altinity-clickhouse-operator.fullname" . }}
+ name: {{ printf "%s-clickhouse-metrics" (include "altinity-clickhouse-operator.fullname" .) }}
  namespace: {{ .Release.Namespace }}
  labels:
  {{- include "altinity-clickhouse-operator.labels" . | nindent 4 }}
@@ -11,7 +11,8 @@ metadata:
  {{- end }}
 spec:
  endpoints:
- - port: clickhouse-operator-metrics
+ - port: clickhouse-metrics # 8888
+ - port: operator-metrics # 9999
  selector:
  matchLabels:
  {{- include "altinity-clickhouse-operator.selectorLabels" . | nindent 6 }}

diff --git a/deploy/operator/clickhouse-operator-install-ansible.yaml b/deploy/operator/clickhouse-operator-install-ansible.yaml
@@ -11,14 +11,14 @@
 # SINGULAR=clickhouseinstallation
 # PLURAL=clickhouseinstallations
 # SHORT=chi
-# OPERATOR_VERSION=0.22.1
+# OPERATOR_VERSION=0.22.2
 #
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  name: clickhouseinstallations.clickhouse.altinity.com
  labels:
- clickhouse.altinity.com/chop: 0.22.1
+ clickhouse.altinity.com/chop: 0.22.2
 spec:
  group: clickhouse.altinity.com
  scope: Namespaced
@@ -1211,14 +1211,14 @@ spec:
 # SINGULAR=clickhouseinstallationtemplate
 # PLURAL=clickhouseinstallationtemplates
 # SHORT=chit
-# OPERATOR_VERSION=0.22.1
+# OPERATOR_VERSION=0.22.2
 #
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
  name: clickhouseinstallationtemplates.clickhouse.altinity.com
  labels:
- clickhouse.altinity.com/chop: 0.22.1
+ clickhouse.altinity.com/chop: 0.22.2
 spec:
  group: clickhouse.altinity.com
  scope: Namespaced
@@ -2414,7 +2414,7 @@ kind: CustomResourceDefinition
 metadata:
  name: clickhouseoperatorconfigurations.clickhouse.altinity.com
  labels:
- clickhouse.altinity.com/chop: 0.22.1
+ clickhouse.altinity.com/chop: 0.22.2
 spec:
  group: clickhouse.altinity.com
  scope: Namespaced
@@ -2829,7 +2829,7 @@ metadata:
  name: clickhouse-operator
  namespace: {{ namespace }}
  labels:
- clickhouse.altinity.com/chop: 0.22.1
+ clickhouse.altinity.com/chop: 0.22.2
 ---
 # Template Parameters:
 #
@@ -2846,7 +2846,7 @@ metadata:
  name: clickhouse-operator
  namespace: {{ namespace }}
  labels:
- clickhouse.altinity.com/chop: 0.22.1
+ clickhouse.altinity.com/chop: 0.22.2
 rules:
 - apiGroups:
  - ""
@@ -3004,7 +3004,7 @@ metadata:
  name: clickhouse-operator
  namespace: {{ namespace }}
  labels:
- clickhouse.altinity.com/chop: 0.22.1
+ clickhouse.altinity.com/chop: 0.22.2
 roleRef:
  apiGroup: rbac.authorization.k8s.io
  kind: Role
@@ -3026,7 +3026,7 @@ metadata:
  name: etc-clickhouse-operator-files
  namespace: {{ namespace }}
  labels:
- clickhouse.altinity.com/chop: 0.22.1
+ clickhouse.altinity.com/chop: 0.22.2
  app: clickhouse-operator
 data:
  config.yaml: |
@@ -3138,6 +3138,7 @@ data:
  
  - zookeeper/*: "yes"
  
+ - files/*.xml: "yes"
  - files/config.d/*.xml: "yes"
  - files/config.d/*dict*.xml: "no"
  
@@ -3381,7 +3382,7 @@ metadata:
  name: etc-clickhouse-operator-confd-files
  namespace: {{ namespace }}
  labels:
- clickhouse.altinity.com/chop: 0.22.1
+ clickhouse.altinity.com/chop: 0.22.2
  app: clickhouse-operator
 data:
 ---
@@ -3397,7 +3398,7 @@ metadata:
  name: etc-clickhouse-operator-configd-files
  namespace: {{ namespace }}
  labels:
- clickhouse.altinity.com/chop: 0.22.1
+ clickhouse.altinity.com/chop: 0.22.2
  app: clickhouse-operator
 data:
  01-clickhouse-01-listen.xml: |
@@ -3496,7 +3497,7 @@ metadata:
  name: etc-clickhouse-operator-templatesd-files
  namespace: {{ namespace }}
  labels:
- clickhouse.altinity.com/chop: 0.22.1
+ clickhouse.altinity.com/chop: 0.22.2
  app: clickhouse-operator
 data:
  001-templates.json.example: |
@@ -3596,7 +3597,7 @@ metadata:
  name: etc-clickhouse-operator-usersd-files
  namespace: {{ namespace }}
  labels:
- clickhouse.altinity.com/chop: 0.22.1
+ clickhouse.altinity.com/chop: 0.22.2
  app: clickhouse-operator
 data:
  01-clickhouse-operator-profile.xml: |
@@ -3641,6 +3642,8 @@ data:
  <parallel_view_processing>1</parallel_view_processing>
  <do_not_merge_across_partitions_select_final>1</do_not_merge_across_partitions_select_final>
  <load_balancing>nearest_hostname</load_balancing>
+ <prefer_localhost_replica>0</prefer_localhost_replica>
+ <!-- materialize_ttl_recalculate_only>1</materialize_ttl_recalculate_only> 21.10 and above -->
  </default>
  </profiles>
  </yandex>
@@ -3649,7 +3652,7 @@ data:
 # Template parameters available:
 # NAMESPACE={{ namespace }}
 # COMMENT=
-# OPERATOR_VERSION=0.22.1
+# OPERATOR_VERSION=0.22.2
 # CH_USERNAME_SECRET_PLAIN=clickhouse_operator
 # CH_PASSWORD_SECRET_PLAIN={{ password }}
 #
@@ -3659,7 +3662,7 @@ metadata:
  name: clickhouse-operator
  namespace: {{ namespace }}
  labels:
- clickhouse.altinity.com/chop: 0.22.1
+ clickhouse.altinity.com/chop: 0.22.2
  app: clickhouse-operator
 type: Opaque
 stringData:
@@ -3670,9 +3673,9 @@ stringData:
 #
 # NAMESPACE={{ namespace }}
 # COMMENT=
-# OPERATOR_IMAGE=altinity/clickhouse-operator:0.22.1
+# OPERATOR_IMAGE=altinity/clickhouse-operator:0.22.2
 # OPERATOR_IMAGE_PULL_POLICY=Always
-# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.22.1
+# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.22.2
 # METRICS_EXPORTER_IMAGE_PULL_POLICY=Always
 #
 # Setup Deployment for clickhouse-operator
@@ -3683,7 +3686,7 @@ metadata:
  name: clickhouse-operator
  namespace: {{ namespace }}
  labels:
- clickhouse.altinity.com/chop: 0.22.1
+ clickhouse.altinity.com/chop: 0.22.2
  app: clickhouse-operator
 spec:
  replicas: 1
@@ -3719,7 +3722,7 @@ spec:
  name: etc-clickhouse-operator-usersd-files
  containers:
  - name: clickhouse-operator
- image: altinity/clickhouse-operator:0.22.1
+ image: altinity/clickhouse-operator:0.22.2
  imagePullPolicy: Always
  volumeMounts:
  - name: etc-clickhouse-operator-folder
@@ -3787,7 +3790,7 @@ spec:
  name: metrics
 
  - name: metrics-exporter
- image: altinity/metrics-exporter:0.22.1
+ image: altinity/metrics-exporter:0.22.2
  imagePullPolicy: Always
  volumeMounts:
  - name: etc-clickhouse-operator-folder
@@ -3870,7 +3873,7 @@ metadata:
  name: clickhouse-operator-metrics
  namespace: {{ namespace }}
  labels:
- clickhouse.altinity.com/chop: 0.22.1
+ clickhouse.altinity.com/chop: 0.22.2
  app: clickhouse-operator
 spec:
  ports: