From 5276dd17cfd3bea41918a69622c385756b0404cb Mon Sep 17 00:00:00 2001 From: Leonardo Cecchi Date: Fri, 3 Oct 2025 18:08:21 +0200 Subject: [PATCH] fix(e2e): avoid pinpointing the PostgreSQL version (#562) Signed-off-by: Leonardo Cecchi --- scripts/run.sh | 2 +- test/e2e/internal/tests/backup/fixtures.go | 2 -- test/e2e/internal/tests/replicacluster/fixtures.go | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/scripts/run.sh b/scripts/run.sh index 6e88bc8..4dee385 100755 --- a/scripts/run.sh +++ b/scripts/run.sh @@ -14,7 +14,7 @@ trap 'rm -rf -- "$MYTMPDIR"' EXIT current_context=$(kubectl config view --raw -o json | jq -r '."current-context"' | sed "s/kind-//") operator_image=$(KIND_CLUSTER_NAME="$current_context" KO_DOCKER_REPO=kind.local ko build -BP ./cmd/manager) -instance_image=$(KIND_CLUSTER_NAME="$current_context" KO_DOCKER_REPO=kind.local KO_DEFAULTBASEIMAGE="ghcr.io/cloudnative-pg/postgresql:17.0" ko build -BP ./cmd/manager) +instance_image=$(KIND_CLUSTER_NAME="$current_context" KO_DOCKER_REPO=kind.local KO_DEFAULTBASEIMAGE="ghcr.io/cloudnative-pg/postgresql:18.0" ko build -BP ./cmd/manager) # Now we deploy the plugin inside the `cnpg-system` workspace ( diff --git a/test/e2e/internal/tests/backup/fixtures.go b/test/e2e/internal/tests/backup/fixtures.go index afba3a2..a881b76 100644 --- a/test/e2e/internal/tests/backup/fixtures.go +++ b/test/e2e/internal/tests/backup/fixtures.go @@ -286,7 +286,6 @@ func newSrcClusterWithPlugin(namespace string) *cloudnativepgv1.Cluster { Spec: cloudnativepgv1.ClusterSpec{ Instances: 2, ImagePullPolicy: corev1.PullAlways, - ImageName: "ghcr.io/cloudnative-pg/postgresql:17-minimal-bookworm", Plugins: []cloudnativepgv1.PluginConfiguration{ { Name: "barman-cloud.cloudnative-pg.io", @@ -323,7 +322,6 @@ func newDstClusterWithPlugin(namespace string) *cloudnativepgv1.Cluster { Spec: cloudnativepgv1.ClusterSpec{ Instances: 2, ImagePullPolicy: corev1.PullAlways, - ImageName: "ghcr.io/cloudnative-pg/postgresql:17-minimal-bookworm", Bootstrap: &cloudnativepgv1.BootstrapConfiguration{ Recovery: &cloudnativepgv1.BootstrapRecovery{ Source: "source", diff --git a/test/e2e/internal/tests/replicacluster/fixtures.go b/test/e2e/internal/tests/replicacluster/fixtures.go index e474052..0583583 100644 --- a/test/e2e/internal/tests/replicacluster/fixtures.go +++ b/test/e2e/internal/tests/replicacluster/fixtures.go @@ -113,7 +113,6 @@ func newSrcCluster(namespace string) *cloudnativepgv1.Cluster { Spec: cloudnativepgv1.ClusterSpec{ Instances: 2, ImagePullPolicy: corev1.PullAlways, - ImageName: "ghcr.io/cloudnative-pg/postgresql:17-minimal-bookworm", Plugins: []cloudnativepgv1.PluginConfiguration{ { Name: "barman-cloud.cloudnative-pg.io", @@ -221,7 +220,6 @@ func newReplicaCluster(namespace string) *cloudnativepgv1.Cluster { Spec: cloudnativepgv1.ClusterSpec{ Instances: 2, ImagePullPolicy: corev1.PullAlways, - ImageName: "ghcr.io/cloudnative-pg/postgresql:17-minimal-bookworm", Bootstrap: &cloudnativepgv1.BootstrapConfiguration{ Recovery: &cloudnativepgv1.BootstrapRecovery{ Source: "source",