Update ClickHouse version in tests

alex-zaitsev · alex-zaitsev · commit b58d3f8f970e · 2025-10-01T11:52:08.000+03:00
diff --git a/tests/e2e/manifests/chi/test-005-acm.yaml b/tests/e2e/manifests/chi/test-005-acm.yaml
@@ -13,7 +13,7 @@ spec:
           fsGroup: 101
         containers:
         - name: clickhouse-pod
-          image: clickhouse/clickhouse-server:24.8.8.17
+          image: altinity/clickhouse-server:25.3.6.10034.altinitystable
           ports:
           - name: http
             containerPort: 8123
diff --git a/tests/e2e/manifests/chi/test-009-operator-upgrade-2.yaml b/tests/e2e/manifests/chi/test-009-operator-upgrade-2.yaml
@@ -64,7 +64,7 @@ spec:
         spec:
           containers:
             - name: clickhouse-pod
-              image: altinity/clickhouse-server:24.8.14.10459.altinitystable
+              image: altinity/clickhouse-server:25.3.6.10034.altinitystable
               ports:
                 - name: http
                   containerPort: 8123
diff --git a/tests/e2e/manifests/chi/test-015-host-network-2.yaml b/tests/e2e/manifests/chi/test-015-host-network-2.yaml
@@ -30,6 +30,6 @@ spec:
           dnsPolicy: ClusterFirstWithHostNet
           containers:
             - name: clickhouse-pod
-              image: clickhouse/clickhouse-server:24.8
+              image: altinity/clickhouse-server:25.3.6.10034.altinitystable
 
 
diff --git a/tests/e2e/manifests/chi/test-015-host-network.yaml b/tests/e2e/manifests/chi/test-015-host-network.yaml
@@ -46,5 +46,5 @@ spec:
           dnsPolicy: ClusterFirstWithHostNet
           containers:
             - name: clickhouse-pod
-              image: clickhouse/clickhouse-server:24.8
+              image: altinity/clickhouse-server:25.3.6.10034.altinitystable
 
diff --git a/tests/e2e/manifests/chi/test-020-1-multi-volume.yaml b/tests/e2e/manifests/chi/test-020-1-multi-volume.yaml
@@ -38,7 +38,7 @@ spec:
         spec:
           containers:
             - name: clickhouse-pod
-              image: clickhouse/clickhouse-server:24.3
+              image: altinity/clickhouse-server:25.3.6.10034.altinitystable
               volumeMounts:
                 - name: disk1
                   mountPath: /var/lib/clickhouse
diff --git a/tests/e2e/manifests/chi/test-020-2-multi-volume.yaml b/tests/e2e/manifests/chi/test-020-2-multi-volume.yaml
@@ -38,7 +38,7 @@ spec:
         spec:
           containers:
             - name: clickhouse-pod
-              image: clickhouse/clickhouse-server:24.3
+              image: altinity/clickhouse-server:25.3.6.10034.altinitystable
               volumeMounts:
                 - name: disk1
                   mountPath: /var/lib/clickhouse
diff --git a/tests/e2e/manifests/chi/test-021-1-rescale-volume-01.yaml b/tests/e2e/manifests/chi/test-021-1-rescale-volume-01.yaml
@@ -27,7 +27,7 @@ spec:
         spec:
           containers:
             - name: clickhouse-pod
-              image: clickhouse/clickhouse-server:24.3
+              image: altinity/clickhouse-server:25.3.6.10034.altinitystable
               volumeMounts:
                 - name: disk1
                   mountPath: /var/lib/clickhouse
diff --git a/tests/e2e/manifests/chi/test-021-1-rescale-volume-02-enlarge-disk.yaml b/tests/e2e/manifests/chi/test-021-1-rescale-volume-02-enlarge-disk.yaml
@@ -27,7 +27,7 @@ spec:
         spec:
           containers:
             - name: clickhouse-pod
-              image: clickhouse/clickhouse-server:24.3
+              image: altinity/clickhouse-server:25.3.6.10034.altinitystable
               volumeMounts:
                 - name: disk1
                   mountPath: /var/lib/clickhouse
diff --git a/tests/e2e/manifests/chi/test-021-1-rescale-volume-03-add-disk.yaml b/tests/e2e/manifests/chi/test-021-1-rescale-volume-03-add-disk.yaml
@@ -38,7 +38,7 @@ spec:
         spec:
           containers:
             - name: clickhouse-pod
-              image: clickhouse/clickhouse-server:24.3
+              image: altinity/clickhouse-server:25.3.6.10034.altinitystable
               volumeMounts:
                 - name: disk1
                   mountPath: /var/lib/clickhouse
diff --git a/tests/e2e/manifests/chi/test-021-1-rescale-volume-04-decrease-disk.yaml b/tests/e2e/manifests/chi/test-021-1-rescale-volume-04-decrease-disk.yaml
@@ -38,7 +38,7 @@ spec:
         spec:
           containers:
             - name: clickhouse-pod
-              image: clickhouse/clickhouse-server:24.3
+              image: altinity/clickhouse-server:25.3.6.10034.altinitystable
               volumeMounts:
                 - name: disk1
                   mountPath: /var/lib/clickhouse
diff --git a/tests/e2e/manifests/chi/test-021-2-rescale-volume-01.yaml b/tests/e2e/manifests/chi/test-021-2-rescale-volume-01.yaml
@@ -29,7 +29,7 @@ spec:
         spec:
           containers:
             - name: clickhouse-pod
-              image: clickhouse/clickhouse-server:24.3
+              image: altinity/clickhouse-server:25.3.6.10034.altinitystable
               volumeMounts:
                 - name: disk1
                   mountPath: /var/lib/clickhouse
diff --git a/tests/e2e/manifests/chi/test-021-2-rescale-volume-02-enlarge-disk.yaml b/tests/e2e/manifests/chi/test-021-2-rescale-volume-02-enlarge-disk.yaml
@@ -29,7 +29,7 @@ spec:
         spec:
           containers:
             - name: clickhouse-pod
-              image: clickhouse/clickhouse-server:24.3
+              image: altinity/clickhouse-server:25.3.6.10034.altinitystable
               volumeMounts:
                 - name: disk1
                   mountPath: /var/lib/clickhouse
diff --git a/tests/e2e/manifests/chi/test-021-2-rescale-volume-03-add-disk.yaml b/tests/e2e/manifests/chi/test-021-2-rescale-volume-03-add-disk.yaml
@@ -40,7 +40,7 @@ spec:
         spec:
           containers:
             - name: clickhouse-pod
-              image: clickhouse/clickhouse-server:24.3
+              image: altinity/clickhouse-server:25.3.6.10034.altinitystable
               volumeMounts:
                 - name: disk1
                   mountPath: /var/lib/clickhouse
diff --git a/tests/e2e/manifests/chi/test-021-2-rescale-volume-04-decrease-disk.yaml b/tests/e2e/manifests/chi/test-021-2-rescale-volume-04-decrease-disk.yaml
@@ -40,7 +40,7 @@ spec:
         spec:
           containers:
             - name: clickhouse-pod
-              image: clickhouse/clickhouse-server:24.3
+              image: altinity/clickhouse-server:25.3.6.10034.altinitystable
               volumeMounts:
                 - name: disk1
                   mountPath: /var/lib/clickhouse
diff --git a/tests/e2e/manifests/chi/test-023-auto-templates.yaml b/tests/e2e/manifests/chi/test-023-auto-templates.yaml
@@ -14,7 +14,7 @@ spec:
         spec:
           containers:
             - name: clickhouse-pod
-              image: clickhouse/clickhouse-server:24.3
+              image: altinity/clickhouse-server:25.3.6.10034.altinitystable
               env:
                 - name: TEST_ENV_FROM_CHI_1
                   value: TEST_ENV_FROM_CHI_1_VALUE
diff --git a/tests/e2e/manifests/chi/test-024-template-annotations-2.yaml b/tests/e2e/manifests/chi/test-024-template-annotations-2.yaml
@@ -16,7 +16,7 @@ spec:
       spec:
         containers:
         - name: clickhouse-pod
-          image: clickhouse/clickhouse-server:24.3
+          image: altinity/clickhouse-server:25.3.6.10034.altinitystable
     volumeClaimTemplates:
     - name: default-volumeclaim-template
       reclaimPolicy: Delete
diff --git a/tests/e2e/manifests/chi/test-024-template-annotations.yaml b/tests/e2e/manifests/chi/test-024-template-annotations.yaml
@@ -14,7 +14,7 @@ spec:
       spec:
         containers:
         - name: clickhouse-pod
-          image: clickhouse/clickhouse-server:24.3
+          image: altinity/clickhouse-server:25.3.6.10034.altinitystable
     volumeClaimTemplates:
     - name: default-volumeclaim-template
       reclaimPolicy: Delete
diff --git a/tests/e2e/manifests/chi/test-025-rescaling-2.yaml b/tests/e2e/manifests/chi/test-025-rescaling-2.yaml
@@ -11,6 +11,7 @@ spec:
       podTemplate: default
   useTemplates:
     - name: persistent-volume
+    - name: clickhouse-version
   configuration:
     zookeeper:
       nodes:
@@ -27,7 +28,6 @@ spec:
         spec:
           containers:
             - name: clickhouse-pod
-              image: clickhouse/clickhouse-server:24.3
               command:
                 - "/bin/bash"
                 - "-c"
diff --git a/tests/e2e/manifests/chi/test-025-rescaling.yaml b/tests/e2e/manifests/chi/test-025-rescaling.yaml
@@ -11,6 +11,7 @@ spec:
       podTemplate: default
   useTemplates:
     - name: persistent-volume
+    - name: clickhouse-version
   configuration:
     zookeeper:
       nodes:
@@ -27,7 +28,6 @@ spec:
         spec:
           containers:
             - name: clickhouse-pod
-              image: clickhouse/clickhouse-server:24.3
               command:
                 - "/bin/bash"
                 - "-c"
diff --git a/tests/e2e/manifests/chi/test-026-mixed-replicas.yaml b/tests/e2e/manifests/chi/test-026-mixed-replicas.yaml
@@ -54,7 +54,7 @@ spec:
         spec:
           containers:
             - name: clickhouse-pod
-              image: clickhouse/clickhouse-server:24.3
+              image: altinity/clickhouse-server:25.3.6.10034.altinitystable
       - name: multi-volume
         spec:
           securityContext:
@@ -63,7 +63,7 @@ spec:
             fsGroup: 101
           containers:
             - name: clickhouse-pod
-              image: clickhouse/clickhouse-server:24.3
+              image: altinity/clickhouse-server:25.3.6.10034.altinitystable
               volumeMounts:
                 - name: disk1
                   mountPath: /var/lib/clickhouse
diff --git a/tests/e2e/manifests/chi/test-029-distribution.yaml b/tests/e2e/manifests/chi/test-029-distribution.yaml
@@ -9,15 +9,15 @@ spec:
       spec:
         containers:
         - name: clickhouse-pod
-          image: clickhouse/clickhouse-server:24.3
+          image: altinity/clickhouse-server:25.3.6.10034.altinitystable
       podDistribution:
       - scope: ClickHouseInstallation
         type: ClickHouseAntiAffinity
     - name: template-2
       spec:
         containers:
         - name: clickhouse-pod
-          image: clickhouse/clickhouse-server:24.3
+          image: altinity/clickhouse-server:25.3.6.10034.altinitystable
       podDistribution:
       - scope: ClickHouseInstallation
         type: ReplicaAntiAffinity
diff --git a/tests/e2e/manifests/chi/test-032-rescaling.yaml b/tests/e2e/manifests/chi/test-032-rescaling.yaml
@@ -11,6 +11,7 @@ spec:
       podTemplate: default
   useTemplates:
     - name: persistent-volume
+    - name: clickhouse-version
   configuration:
     zookeeper:
       nodes:
@@ -23,11 +24,4 @@ spec:
       - name: default
         layout:
           shardsCount: 2
-          replicasCount: 2
-  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-034-client.yaml b/tests/e2e/manifests/chi/test-034-client.yaml
@@ -24,7 +24,7 @@ metadata:
 spec:
   containers:
     - name: clickhouse-client
-      image: altinity/clickhouse-server:24.8.14.10459.altinitystable
+      image: altinity/clickhouse-server:25.3.6.10034.altinitystable
       command: [ "/bin/sh", "-c", "sleep 3600" ]
       volumeMounts:
       - name: client-config
diff --git a/tests/e2e/manifests/chi/test-040-startup-probe.yaml b/tests/e2e/manifests/chi/test-040-startup-probe.yaml
@@ -14,17 +14,18 @@ spec:
           readiness: "no"
   defaults:
     templates:
-      podTemplate: not-ready-replica
+      podTemplate: default
+  useTemplates:
+    - name: clickhouse-version
   configuration:
     clusters:
       - name: default
   templates:
     podTemplates:
-      - name: not-ready-replica
+      - name: default
         spec:
           containers:
             - name: clickhouse-pod
-              image: clickhouse/clickhouse-server:24.8
               # startupProbe:
               #   httpGet:
               #     path: /ping
diff --git a/tests/e2e/manifests/chi/test-041-secure-zookeeper.yaml b/tests/e2e/manifests/chi/test-041-secure-zookeeper.yaml
@@ -6,13 +6,14 @@ spec:
   defaults:
     templates:
       podTemplate: default
+  useTemplates:
+    - name: clickhouse-version
   templates:
     podTemplates:
       - name: default
         spec:
           containers:
             - name: clickhouse-pod
-              image: clickhouse/clickhouse-server:24.8
               imagePullPolicy: IfNotPresent
               command:
                 - /bin/bash
diff --git a/tests/e2e/manifests/chi/test-043-0-logs-container-customizing.yaml b/tests/e2e/manifests/chi/test-043-0-logs-container-customizing.yaml
@@ -3,13 +3,18 @@ kind: ClickHouseInstallation
 metadata:
   name: test-043-0-logs-customization
 spec:
+  defaults:
+    templates:
+      podTemplate: default
+      logVolumeClaimTemplate: log-volume-template
+  useTemplates:
+    - name: clickhouse-version
   templates:
     podTemplates:
-    - name: pod-template
+    - name: default
       spec:
         containers:
-          - name: clickhouse
-            image: clickhouse/clickhouse-server:24.3
+          - name: clickhouse-pod
           - name: clickhouse-log
             image: registry.access.redhat.com/ubi8/ubi-minimal:latest
             command:
@@ -26,7 +31,3 @@ spec:
           resources:
             requests:
               storage: 10Mi
-  defaults:
-    templates:
-      podTemplate: pod-template
-      logVolumeClaimTemplate: log-volume-template
diff --git a/tests/e2e/manifests/chi/test-043-1-logs-container-customizing.yaml b/tests/e2e/manifests/chi/test-043-1-logs-container-customizing.yaml
@@ -3,13 +3,18 @@ kind: ClickHouseInstallation
 metadata:
   name: test-043-1-logs-customization
 spec:
+  defaults:
+    templates:
+      podTemplate: default
+      logVolumeClaimTemplate: log-volume-template
+  useTemplates:
+    - name: clickhouse-version
   templates:
     podTemplates:
-    - name: pod-template
+    - name: default
       spec:
         containers:
-          - name: clickhouse
-            image: clickhouse/clickhouse-server:24.3
+          - name: clickhouse-pod
     volumeClaimTemplates:
       - name: log-volume-template
         spec:
@@ -18,7 +23,3 @@ spec:
           resources:
             requests:
               storage: 10Mi
-  defaults:
-    templates:
-      podTemplate: pod-template
-      logVolumeClaimTemplate: log-volume-template
diff --git a/tests/e2e/manifests/chi/test-044-0-slow-propagation.yaml b/tests/e2e/manifests/chi/test-044-0-slow-propagation.yaml
@@ -24,4 +24,4 @@ spec:
         spec:
           containers:
             - name: clickhouse-pod
-              image: clickhouse/clickhouse-server:24.8
+              image: altinity/clickhouse-server:25.3.6.10034.altinitystable
diff --git a/tests/e2e/manifests/chi/test-044-1-slow-propagation.yaml b/tests/e2e/manifests/chi/test-044-1-slow-propagation.yaml
@@ -26,12 +26,12 @@ spec:
         spec:
           containers:
             - name: clickhouse-pod
-              image: clickhouse/clickhouse-server:24.8
+              image: altinity/clickhouse-server:25.3.6.10034.altinitystable
       - name: slow-replica
         spec:
           containers:
             - name: clickhouse-pod
-              image: clickhouse/clickhouse-server:24.8
+              image: altinity/clickhouse-server:25.3.6.10034.altinitystable
               command:
                 - "/bin/bash"
                 - "-c"
diff --git a/tests/e2e/test_operator.py b/tests/e2e/test_operator.py
