Merge branch '0.25.6' of github.com:Altinity/clickhouse-operator into improve-prometheus-rules

Slach · Slach · commit 669e5b84375b · 2025-12-03T14:11:07.000+04:00
diff --git a/.github/workflows/run_tests.yaml b/.github/workflows/run_tests.yaml
@@ -47,7 +47,7 @@ jobs:
         with:
           driver: docker
           container-runtime: containerd
-          kubernetes-version: v1.31.2
+          kubernetes-version: v1.33.5
           cpus: max
           memory: max
 
diff --git a/config/config-dev.yaml b/config/config-dev.yaml
@@ -123,7 +123,7 @@ clickhouse:
           # these settings should not lead to pod restarts
           - settings/display_secrets_in_show_and_select: "no"
 
-          - zookeeper/*: "yes"
+          - zookeeper/*: "no"
 
           - files/*.xml: "yes"
           - files/config.d/*.xml: "yes"
@@ -455,8 +455,8 @@ status:
   fields:
     action: false
     actions: false
-    error: false
-    errors: false
+    error: true
+    errors: true
 
 ################################################
 ##
diff --git a/config/config.yaml b/config/config.yaml
@@ -121,7 +121,7 @@ clickhouse:
           # these settings should not lead to pod restarts
           - settings/display_secrets_in_show_and_select: "no"
 
-          - zookeeper/*: "yes"
+          - zookeeper/*: "no"
 
           - files/*.xml: "yes"
           - files/config.d/*.xml: "yes"
@@ -453,8 +453,8 @@ status:
   fields:
     action: false
     actions: false
-    error: false
-    errors: false
+    error: true
+    errors: true
 
 ################################################
 ##
diff --git a/deploy/builder/templates-config/config.yaml b/deploy/builder/templates-config/config.yaml
@@ -115,7 +115,7 @@ clickhouse:
           # these settings should not lead to pod restarts
           - settings/display_secrets_in_show_and_select: "no"
 
-          - zookeeper/*: "yes"
+          - zookeeper/*: "no"
 
           - files/*.xml: "yes"
           - files/config.d/*.xml: "yes"
@@ -447,8 +447,8 @@ status:
   fields:
     action: false
     actions: false
-    error: false
-    errors: false
+    error: true
+    errors: true
 
 ################################################
 ##
diff --git a/deploy/helm/clickhouse-operator/values.yaml b/deploy/helm/clickhouse-operator/values.yaml
@@ -324,7 +324,7 @@ configs:
                 - settings/user_directories/*: "no"
                 # these settings should not lead to pod restarts
                 - settings/display_secrets_in_show_and_select: "no"
-                - zookeeper/*: "yes"
+                - zookeeper/*: "no"
                 - files/*.xml: "yes"
                 - files/config.d/*.xml: "yes"
                 - files/config.d/*dict*.xml: "no"
@@ -634,8 +634,8 @@ configs:
         fields:
           action: false
           actions: false
-          error: false
-          errors: false
+          error: true
+          errors: true
       ################################################
       ##
       ## StatefulSet management section
diff --git a/deploy/operator/clickhouse-operator-install-ansible.yaml b/deploy/operator/clickhouse-operator-install-ansible.yaml
@@ -4775,7 +4775,7 @@ data:
               # these settings should not lead to pod restarts
               - settings/display_secrets_in_show_and_select: "no"
     
-              - zookeeper/*: "yes"
+              - zookeeper/*: "no"
     
               - files/*.xml: "yes"
               - files/config.d/*.xml: "yes"
@@ -5107,8 +5107,8 @@ data:
       fields:
         action: false
         actions: false
-        error: false
-        errors: false
+        error: true
+        errors: true
     
     ################################################
     ##
diff --git a/deploy/operator/clickhouse-operator-install-bundle-v1beta1.yaml b/deploy/operator/clickhouse-operator-install-bundle-v1beta1.yaml
@@ -4974,7 +4974,7 @@ data:
               # these settings should not lead to pod restarts
               - settings/display_secrets_in_show_and_select: "no"
 
-              - zookeeper/*: "yes"
+              - zookeeper/*: "no"
 
               - files/*.xml: "yes"
               - files/config.d/*.xml: "yes"
@@ -5306,8 +5306,8 @@ data:
       fields:
         action: false
         actions: false
-        error: false
-        errors: false
+        error: true
+        errors: true
 
     ################################################
     ##
diff --git a/deploy/operator/clickhouse-operator-install-bundle.yaml b/deploy/operator/clickhouse-operator-install-bundle.yaml
@@ -5034,7 +5034,7 @@ data:
               # these settings should not lead to pod restarts
               - settings/display_secrets_in_show_and_select: "no"
     
-              - zookeeper/*: "yes"
+              - zookeeper/*: "no"
     
               - files/*.xml: "yes"
               - files/config.d/*.xml: "yes"
@@ -5366,8 +5366,8 @@ data:
       fields:
         action: false
         actions: false
-        error: false
-        errors: false
+        error: true
+        errors: true
     
     ################################################
     ##
diff --git a/deploy/operator/clickhouse-operator-install-template-v1beta1.yaml b/deploy/operator/clickhouse-operator-install-template-v1beta1.yaml
@@ -4721,7 +4721,7 @@ data:
               # these settings should not lead to pod restarts
               - settings/display_secrets_in_show_and_select: "no"
 
-              - zookeeper/*: "yes"
+              - zookeeper/*: "no"
 
               - files/*.xml: "yes"
               - files/config.d/*.xml: "yes"
@@ -5053,8 +5053,8 @@ data:
       fields:
         action: false
         actions: false
-        error: false
-        errors: false
+        error: true
+        errors: true
 
     ################################################
     ##
diff --git a/deploy/operator/clickhouse-operator-install-template.yaml b/deploy/operator/clickhouse-operator-install-template.yaml
@@ -4768,7 +4768,7 @@ data:
               # these settings should not lead to pod restarts
               - settings/display_secrets_in_show_and_select: "no"
     
-              - zookeeper/*: "yes"
+              - zookeeper/*: "no"
     
               - files/*.xml: "yes"
               - files/config.d/*.xml: "yes"
@@ -5100,8 +5100,8 @@ data:
       fields:
         action: false
         actions: false
-        error: false
-        errors: false
+        error: true
+        errors: true
     
     ################################################
     ##
diff --git a/deploy/operator/clickhouse-operator-install-tf.yaml b/deploy/operator/clickhouse-operator-install-tf.yaml
@@ -4775,7 +4775,7 @@ data:
               # these settings should not lead to pod restarts
               - settings/display_secrets_in_show_and_select: "no"
     
-              - zookeeper/*: "yes"
+              - zookeeper/*: "no"
     
               - files/*.xml: "yes"
               - files/config.d/*.xml: "yes"
@@ -5107,8 +5107,8 @@ data:
       fields:
         action: false
         actions: false
-        error: false
-        errors: false
+        error: true
+        errors: true
     
     ################################################
     ##
diff --git a/pkg/controller/chi/worker-wait-exclude-include-restart.go b/pkg/controller/chi/worker-wait-exclude-include-restart.go
@@ -395,7 +395,7 @@ func (w *worker) shouldExcludeHost(ctx context.Context, host *api.Host) bool {
 		return false
 	}
 
-	shouldExcludeHost := true
+	shouldExcludeHost := false
 	w.a.V(1).
 		M(host).F().
 		Info("No explicit case on whether host should be excluded - going default %t. Host/shard/cluster: %d/%d/%s",
diff --git a/pkg/model/zookeeper/connection_params.go b/pkg/model/zookeeper/connection_params.go
@@ -17,7 +17,7 @@ package zookeeper
 import "time"
 
 const (
-	defaultMaxRetriesNum               = 10
+	defaultMaxRetriesNum               = 30
 	defaultMaxConcurrentRequests int64 = 32
 
 	defaultTimeoutConnect   = 10 * time.Second
diff --git a/tests/e2e/kubectl.py b/tests/e2e/kubectl.py
@@ -12,7 +12,7 @@
 import e2e.util as util
 
 current_dir = os.path.dirname(os.path.abspath(__file__))
-max_retries = 30
+max_retries = 20
 
 
 def launch(command, ok_to_fail=False, ns=None, timeout=600, shell=None):
@@ -170,15 +170,13 @@ def create_and_check(manifest, check, kind="chi", ns=None, shell=None, timeout=1
     else:
         # Wait for reconcile to start before performing other checks. In some cases it does not start, so we can pass
         # wait_field_changed("chi", chi_name, state_field, prev_state, ns)
-        wait_field(kind=kind, name=chi_name, field=".status.status", value="InProgress",
-                   ns=ns, retries=3, throw_error=False, shell=shell)
+        wait_field(kind=kind, name=chi_name, field=".status.status", value="InProgress"
+                   , ns=ns, retries=3, throw_error=False, shell=shell)
+        actionPlan = get_actionPlan(kind, chi_name, ns, shell)
+        print(actionPlan)
 
-        # getter is buggy, not expecting neither situation w/o plan nor to meet old operator w/o plan
-        # thus crashing good test(s)
-        # action_plan = get_actionPlan(kind, chi_name, ns, shell)
-        # print(action_plan)
-
-        wait_field(kind=kind, name=chi_name, field=".status.status", value="Completed", ns=ns, shell=shell)
+        wait_field(kind=kind, name=chi_name, field=".status.status", value="Completed"
+                   , ns=ns, shell=shell)
 
     if "object_counts" in check:
         wait_objects(chi_name, check["object_counts"], ns=ns, shell=shell)
@@ -239,13 +237,12 @@ def get_chi_normalizedCompleted(chi, ns=None, shell=None):
     chi_storage = get("configmap", f"chi-storage-{chi}", ns=ns)
     return json.loads(chi_storage["data"]["status-normalizedCompleted"])
 
-
 def get_actionPlan(kind, name, ns=None, shell=None):
     if kind == 'chi':
-        storage = get("configmap", f"chi-storage-{name}", ns=ns, ok_to_fail=True)
-        return storage.get("data", {}).get("status-actionPlan", "")
-    else:
-        return ""
+        storage = get("configmap", f"chi-storage-{name}", ok_to_fail=True, ns=ns)
+        if storage != None:
+            return storage["data"].get("status-actionPlan", "")
+    return ""
 
 
 def create_ns(ns):
@@ -423,11 +420,9 @@ def wait_pod_status(pod, status, shell=None, ns=None):
 def get_pod_status(pod, shell=None, ns=None):
     return get_field("pod", pod, ".status.phase", ns, shell=shell)
 
-
 def wait_container_status(pod, status, shell=None, ns=None):
     wait_field("pod", pod, ".status.containerStatuses[0].ready", status, ns, shell=shell)
 
-
 def get_container_status(pod, shell=None, ns=None):
     return get_field("pod", pod, ".status.containerStatuses[0]", ns, shell=shell)
 
@@ -529,7 +524,6 @@ def get_pod_spec(chi_name, pod_name="", ns=None, shell=None):
         pod = get("pod", pod_name, ns=ns, shell=shell)
     return pod["spec"]
 
-
 def get_pod_status_full(chi_name, pod_name="", ns=None, shell=None):
     label = f"-l clickhouse.altinity.com/chi={chi_name}"
     if pod_name == "":
diff --git a/tests/e2e/manifests/chi/test-008-operator-restart-1.yaml b/tests/e2e/manifests/chi/test-008-operator-restart-1.yaml
@@ -12,6 +12,7 @@ spec:
       - name: test-008-1
         layout:
           shardsCount: 2
+          replicasCount: 2
     users:
       test_008/password: test_008
       test_008/networks/ip: 0.0.0.0/0
diff --git a/tests/e2e/manifests/chi/test-008-operator-restart-2.yaml b/tests/e2e/manifests/chi/test-008-operator-restart-2.yaml
@@ -64,7 +64,7 @@ spec:
         spec:
           containers:
             - name: clickhouse-pod
-              image: clickhouse/clickhouse-server:24.3
+              image: clickhouse/clickhouse-server:25.3
               ports:
                 - name: http
                   containerPort: 8123
diff --git a/tests/e2e/manifests/chi/test-008-operator-restart-3-1.yaml b/tests/e2e/manifests/chi/test-008-operator-restart-3-1.yaml
@@ -2,32 +2,12 @@ apiVersion: "clickhouse.altinity.com/v1"
 kind: "ClickHouseInstallation"
 metadata:
   name: "test-008-3"
-  labels:
-    test: test
 spec:
   useTemplates:
-    - name: persistent-volume
+    - name: clickhouse-version
   configuration:
-    zookeeper:
-      nodes:
-        - host: zookeeper
-          port: 2181
     clusters:
       - name: test-008-3
         layout:
           shardsCount: 2
-          replicasCount: 2
-    users:
-      test_008/password: test_008
-      test_008/networks/ip: 0.0.0.0/0
-  defaults:
-    templates:
-      dataVolumeClaimTemplate: default
-      podTemplate: default
-  templates:
-    podTemplates:
-    - name: default
-      spec:
-        containers:
-        - name: clickhouse-pod
-          image: clickhouse/clickhouse-server:24.8
+          replicasCount: 2
diff --git a/tests/e2e/manifests/chi/test-008-operator-restart-3-2.yaml b/tests/e2e/manifests/chi/test-008-operator-restart-3-2.yaml
diff --git a/tests/e2e/manifests/chi/test-060-pdb-management-disabled.yaml b/tests/e2e/manifests/chi/test-060-pdb-management-disabled.yaml
@@ -3,6 +3,8 @@ kind: "ClickHouseInstallation"
 metadata:
   name: "test-060-pdb-management-disabled"
 spec:
+  useTemplates:
+    - name: clickhouse-version
   configuration:
     clusters:
       - name: single
diff --git a/tests/e2e/manifests/chi/test-061-fractional-cpu-1.yaml b/tests/e2e/manifests/chi/test-061-fractional-cpu-1.yaml
diff --git a/tests/e2e/manifests/chi/test-061-fractional-cpu-2.yaml b/tests/e2e/manifests/chi/test-061-fractional-cpu-2.yaml
diff --git a/tests/e2e/test_operator.py b/tests/e2e/test_operator.py
diff --git a/tests/regression.py b/tests/regression.py
