Skip to content

Commit

Permalink
Switch test baseline to 24.3
Browse files Browse the repository at this point in the history
  • Loading branch information
alex-zaitsev committed Jun 27, 2024
1 parent 70afb9c commit 5b9a235
Show file tree
Hide file tree
Showing 44 changed files with 72 additions and 51 deletions.
2 changes: 1 addition & 1 deletion tests/e2e/manifests/chi/test-005-acm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ spec:
fsGroup: 101
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.8
image: clickhouse/clickhouse-server:24.3
ports:
- name: http
containerPort: 8123
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/manifests/chi/test-006-ch-upgrade-1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.3
image: clickhouse/clickhouse-server:23.8
defaults:
templates:
podTemplate: clickhouse-old
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/manifests/chi/test-006-ch-upgrade-2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.8
image: clickhouse/clickhouse-server:24.3
defaults:
templates:
podTemplate: clickhouse-new
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/manifests/chi/test-006-ch-upgrade-3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.3
image: clickhouse/clickhouse-server:23.8
defaults:
templates:
podTemplate: clickhouse-new
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/manifests/chi/test-008-operator-restart-2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.8
image: clickhouse/clickhouse-server:24.3
ports:
- name: http
containerPort: 8123
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/manifests/chi/test-008-operator-restart-3-1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.3
image: clickhouse/clickhouse-server:23.8
2 changes: 1 addition & 1 deletion tests/e2e/manifests/chi/test-008-operator-restart-3-2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.8
image: clickhouse/clickhouse-server:24.3
2 changes: 1 addition & 1 deletion tests/e2e/manifests/chi/test-009-operator-upgrade-2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: altinity/clickhouse-server:22.8.15.25.altinitystable
image: altinity/clickhouse-server:23.8.11.29.altinitystable
ports:
- name: http
containerPort: 8123
Expand Down
3 changes: 2 additions & 1 deletion tests/e2e/manifests/chi/test-013-1-1-schema-propagation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ spec:
profiles:
default/allow_experimental_window_view: 1
default/allow_experimental_live_view: 1
default/database_atomic_wait_for_drop_and_detach_synchronously: 1
default/database_atomic_wait_for_drop_and_detach_synchronously: 1
default/allow_experimental_analyzer: 0
3 changes: 2 additions & 1 deletion tests/e2e/manifests/chi/test-013-1-2-schema-propagation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ spec:
profiles:
default/allow_experimental_window_view: 1
default/allow_experimental_live_view: 1
default/database_atomic_wait_for_drop_and_detach_synchronously: 1
default/database_atomic_wait_for_drop_and_detach_synchronously: 1
default/allow_experimental_analyzer: 0
3 changes: 2 additions & 1 deletion tests/e2e/manifests/chi/test-013-1-3-schema-propagation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ spec:
profiles:
default/allow_experimental_window_view: 1
default/allow_experimental_live_view: 1
default/database_atomic_wait_for_drop_and_detach_synchronously: 1
default/database_atomic_wait_for_drop_and_detach_synchronously: 1
default/allow_experimental_analyzer: 0
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ spec:
default/allow_experimental_window_view: 1
default/allow_experimental_live_view: 1
default/database_atomic_wait_for_drop_and_detach_synchronously: 1
default/allow_experimental_analyzer: 0
2 changes: 1 addition & 1 deletion tests/e2e/manifests/chi/test-015-host-network.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
hostNetwork: true
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.8
image: clickhouse/clickhouse-server:24.3


# dnsPolicy: ClusterFirstWithHostNet
2 changes: 1 addition & 1 deletion tests/e2e/manifests/chi/test-020-1-multi-volume.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.8
image: clickhouse/clickhouse-server:24.3
volumeMounts:
- name: disk1
mountPath: /var/lib/clickhouse
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/manifests/chi/test-020-2-multi-volume.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.8
image: clickhouse/clickhouse-server:24.3
volumeMounts:
- name: disk1
mountPath: /var/lib/clickhouse
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/manifests/chi/test-021-1-rescale-volume-01.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.8
image: clickhouse/clickhouse-server:24.3
volumeMounts:
- name: disk1
mountPath: /var/lib/clickhouse
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.8
image: clickhouse/clickhouse-server:24.3
volumeMounts:
- name: disk1
mountPath: /var/lib/clickhouse
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.8
image: clickhouse/clickhouse-server:24.3
volumeMounts:
- name: disk1
mountPath: /var/lib/clickhouse
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.8
image: clickhouse/clickhouse-server:24.3
volumeMounts:
- name: disk1
mountPath: /var/lib/clickhouse
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/manifests/chi/test-021-2-rescale-volume-01.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.8
image: clickhouse/clickhouse-server:24.3
volumeMounts:
- name: disk1
mountPath: /var/lib/clickhouse
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.8
image: clickhouse/clickhouse-server:24.3
volumeMounts:
- name: disk1
mountPath: /var/lib/clickhouse
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.8
image: clickhouse/clickhouse-server:24.3
volumeMounts:
- name: disk1
mountPath: /var/lib/clickhouse
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.8
image: clickhouse/clickhouse-server:24.3
volumeMounts:
- name: disk1
mountPath: /var/lib/clickhouse
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/manifests/chi/test-022-broken-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.8-broken
image: clickhouse/clickhouse-server:24.3-broken
configuration:
clusters:
- name: default
2 changes: 1 addition & 1 deletion tests/e2e/manifests/chi/test-023-auto-templates.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.8
image: clickhouse/clickhouse-server:24.3
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.8
image: clickhouse/clickhouse-server:24.3
volumeClaimTemplates:
- name: default-volumeclaim-template
reclaimPolicy: Delete
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/manifests/chi/test-024-template-annotations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.8
image: clickhouse/clickhouse-server:24.3
volumeClaimTemplates:
- name: default-volumeclaim-template
reclaimPolicy: Delete
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/manifests/chi/test-025-rescaling-2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.8
image: clickhouse/clickhouse-server:24.3
command:
- "/bin/bash"
- "-c"
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/manifests/chi/test-025-rescaling.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.8
image: clickhouse/clickhouse-server:24.3
command:
- "/bin/bash"
- "-c"
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/manifests/chi/test-026-mixed-replicas.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.8
image: clickhouse/clickhouse-server:24.3
- name: multi-volume
spec:
securityContext:
Expand All @@ -63,7 +63,7 @@ spec:
fsGroup: 101
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.8
image: clickhouse/clickhouse-server:24.3
volumeMounts:
- name: disk1
mountPath: /var/lib/clickhouse
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/manifests/chi/test-029-distribution.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.8
image: clickhouse/clickhouse-server:24.3
podDistribution:
- scope: ClickHouseInstallation
type: ClickHouseAntiAffinity
- name: template-2
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.8
image: clickhouse/clickhouse-server:24.3
podDistribution:
- scope: ClickHouseInstallation
type: ReplicaAntiAffinity
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/manifests/chi/test-032-rescaling-2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.3
image: clickhouse/clickhouse-server:23.8
2 changes: 1 addition & 1 deletion tests/e2e/manifests/chi/test-032-rescaling.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.8
image: clickhouse/clickhouse-server:24.3
2 changes: 1 addition & 1 deletion tests/e2e/manifests/chi/test-041-secure-zookeeper.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: altinity/clickhouse-server:23.8.8.21.altinitystable
image: clickhouse/clickhouse-server:24.3
imagePullPolicy: IfNotPresent
command:
- /bin/bash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
spec:
containers:
- name: clickhouse
image: clickhouse/clickhouse-server:23.8
image: clickhouse/clickhouse-server:24.3
- name: clickhouse-log
image: registry.access.redhat.com/ubi8/ubi-minimal:latest
command:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
spec:
containers:
- name: clickhouse
image: clickhouse/clickhouse-server:23.8
image: clickhouse/clickhouse-server:24.3
volumeClaimTemplates:
- name: log-volume-template
spec:
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/manifests/chi/test-044-0-slow-propagation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.8
image: clickhouse/clickhouse-server:24.3
4 changes: 2 additions & 2 deletions tests/e2e/manifests/chi/test-044-1-slow-propagation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.8
image: clickhouse/clickhouse-server:24.3
- name: slow-replica
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.8
image: clickhouse/clickhouse-server:24.3
command:
- "/bin/bash"
- "-c"
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/manifests/chi/test-044-2-slow-propagation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.8
image: clickhouse/clickhouse-server:24.3
- name: slow-replica
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:23.8
image: clickhouse/clickhouse-server:24.3
command:
- "/bin/bash"
- "-c"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:22.8-broken
image: clickhouse/clickhouse-server:24.3-broken
defaults:
templates:
podTemplate: clickhouse-new
17 changes: 17 additions & 0 deletions tests/e2e/manifests/chit/tpl-clickhouse-24.3.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
apiVersion: "clickhouse.altinity.com/v1"
kind: "ClickHouseInstallationTemplate"

metadata:
name: clickhouse-version
spec:
defaults:
templates:
podTemplate: default
templates:
podTemplates:
- name: default
spec:
containers:
- name: clickhouse-pod
image: clickhouse/clickhouse-server:24.3
imagePullPolicy: IfNotPresent
Loading

0 comments on commit 5b9a235

Please sign in to comment.