Merge pull request #1947 from Altinity/0.26.2

0.26.2

Author: sunsingerus

README.md

@@ -34,7 +34,7 @@ The Altinity Kubernetes Operator for ClickHouse is a community effort sponsored
 
 ## Requirements
 
- * Kubernetes 1.19+
+ * Kubernetes 1.25+
  * ClickHouse 21.11+. For older ClickHouse versions use operator 0.23.7 or earlier.
 
 ## Documentation

cmd/operator/app/thread_keeper.go

@@ -49,7 +49,11 @@ func initKeeper(ctx context.Context) error {
 	manager, err = ctrlRuntime.NewManager(ctrlRuntime.GetConfigOrDie(), ctrlRuntime.Options{
 		Scheme: scheme,
 		Cache: cache.Options{
-			Namespaces: []string{chop.Config().GetInformerNamespace()},
+			// GetCacheNamespaces returns exact namespace names when all configured watch namespaces are
+			// valid DNS labels, enabling per-namespace cache scoping. Falls back to NamespaceAll when
+			// any watch namespace is a regexp pattern (the controller's Reconcile guard handles filtering
+			// in that case).
+			Namespaces: chop.Config().GetCacheNamespaces(),
 		},
 	})
 	if err != nil {
@@ -71,6 +75,7 @@ func initKeeper(ctx context.Context) error {
 		Complete(
 			&controller.Controller{
 				Client:    manager.GetClient(),
+				APIReader: manager.GetAPIReader(),
 				Scheme:    manager.GetScheme(),
 				ExtClient: extClient,
 			},

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

@@ -5,6 +5,7 @@
 <!-- deploy/builder/templates-config -->
 <!-- IMPORTANT -->
 <clickhouse>
+    <asynchronous_metrics_keeper_metrics_only>1</asynchronous_metrics_keeper_metrics_only>
     <keeper_server>
         <coordination_settings>
             <min_session_timeout_ms>10000</min_session_timeout_ms>

deploy/builder/operatorhub.sh

@@ -69,9 +69,10 @@ rm "${RBAC_ROLE_RULES_FILE}"
 # Insert examples into CVV file
 EXAMPLES_FILE="qwe.yaml"
 F1="${SRC_ROOT}/docs/chi-examples/01-simple-layout-01-1shard-1repl.yaml"
-F2="${SRC_ROOT}/docs/chi-examples/50-CHIT-10-useTemplates-and-use-templates-with-selector.yaml"
+F2="${SRC_ROOT}/docs/chi-examples/50-CHIT-02-manual-template-with-selector.yaml"
 F3="${SRC_ROOT}/docs/chi-examples/70-chop-config.yaml"
-yq -n -I=2 -o=json ".[0] = load(\"${F1}\") | .[1] = load(\"${F2}\") | .[2] = load(\"${F3}\")" > "${EXAMPLES_FILE}"
+F4="${SRC_ROOT}/docs/chk-examples/01-simple-1.yaml"
+yq -n -I=2 -o=json ".[0] = load(\"${F1}\") | .[1] = load(\"${F2}\") | .[2] = load(\"${F3}\") | .[3] = load(\"${F4}\")" > "${EXAMPLES_FILE}"
 yq -i ".metadata.annotations.alm-examples = strload(\"${EXAMPLES_FILE}\")" "${CVV_FILE_TEMPLATE}"
 rm "${EXAMPLES_FILE}"
 

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

@@ -1,4 +1,5 @@
 <clickhouse>
+    <asynchronous_metrics_keeper_metrics_only>1</asynchronous_metrics_keeper_metrics_only>
     <keeper_server>
         <coordination_settings>
             <min_session_timeout_ms>10000</min_session_timeout_ms>

deploy/builder/templates-operatorhub/clickhouse-operator.vVERSION.clusterserviceversion-template.yaml

@@ -23,7 +23,7 @@ metadata:
       "{HERE WILL BE THE EXAMPLES}"
 spec:
   version: ${OPERATOR_VERSION}
-  minKubeVersion: 1.12.6
+  minKubeVersion: 1.25.0
   maturity: alpha
   replaces: clickhouse-operator.v${PREVIOUS_OPERATOR_VERSION}
   maintainers:

deploy/helm/clickhouse-operator/Chart.yaml

@@ -17,8 +17,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.26.1
-appVersion: 0.26.1
+version: 0.26.2
+appVersion: 0.26.2
 home: https://github.com/Altinity/clickhouse-operator
 icon: https://logosandtypes.com/wp-content/uploads/2020/12/altinity.svg
 maintainers:

deploy/helm/clickhouse-operator/README.md

@@ -1,6 +1,6 @@
 # altinity-clickhouse-operator
 
-![Version: 0.26.1](https://img.shields.io/badge/Version-0.26.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.26.1](https://img.shields.io/badge/AppVersion-0.26.1-informational?style=flat-square)
+![Version: 0.26.2](https://img.shields.io/badge/Version-0.26.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.26.2](https://img.shields.io/badge/AppVersion-0.26.2-informational?style=flat-square)
 
 Helm chart to deploy [altinity-clickhouse-operator](https://github.com/Altinity/clickhouse-operator).
 

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

@@ -4,14 +4,14 @@
 # SINGULAR=clickhouseinstallation
 # PLURAL=clickhouseinstallations
 # SHORT=chi
-# OPERATOR_VERSION=0.26.1
+# OPERATOR_VERSION=0.26.2
 #
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: clickhouseinstallations.clickhouse.altinity.com
   labels:
-    clickhouse.altinity.com/chop: 0.26.1
+    clickhouse.altinity.com/chop: 0.26.2
 spec:
   group: clickhouse.altinity.com
   scope: Namespaced

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

@@ -4,14 +4,14 @@
 # SINGULAR=clickhouseinstallationtemplate
 # PLURAL=clickhouseinstallationtemplates
 # SHORT=chit
-# OPERATOR_VERSION=0.26.1
+# OPERATOR_VERSION=0.26.2
 #
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: clickhouseinstallationtemplates.clickhouse.altinity.com
   labels:
-    clickhouse.altinity.com/chop: 0.26.1
+    clickhouse.altinity.com/chop: 0.26.2
 spec:
   group: clickhouse.altinity.com
   scope: Namespaced