Skip to content

Commit 5276dd1

Browse files
authored
fix(e2e): avoid pinpointing the PostgreSQL version (#562)
Signed-off-by: Leonardo Cecchi <[email protected]>
1 parent 6997039 commit 5276dd1

File tree

3 files changed

+1
-5
lines changed

3 files changed

+1
-5
lines changed

scripts/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ trap 'rm -rf -- "$MYTMPDIR"' EXIT
1414

1515
current_context=$(kubectl config view --raw -o json | jq -r '."current-context"' | sed "s/kind-//")
1616
operator_image=$(KIND_CLUSTER_NAME="$current_context" KO_DOCKER_REPO=kind.local ko build -BP ./cmd/manager)
17-
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)
17+
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)
1818

1919
# Now we deploy the plugin inside the `cnpg-system` workspace
2020
(

test/e2e/internal/tests/backup/fixtures.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,6 @@ func newSrcClusterWithPlugin(namespace string) *cloudnativepgv1.Cluster {
286286
Spec: cloudnativepgv1.ClusterSpec{
287287
Instances: 2,
288288
ImagePullPolicy: corev1.PullAlways,
289-
ImageName: "ghcr.io/cloudnative-pg/postgresql:17-minimal-bookworm",
290289
Plugins: []cloudnativepgv1.PluginConfiguration{
291290
{
292291
Name: "barman-cloud.cloudnative-pg.io",
@@ -323,7 +322,6 @@ func newDstClusterWithPlugin(namespace string) *cloudnativepgv1.Cluster {
323322
Spec: cloudnativepgv1.ClusterSpec{
324323
Instances: 2,
325324
ImagePullPolicy: corev1.PullAlways,
326-
ImageName: "ghcr.io/cloudnative-pg/postgresql:17-minimal-bookworm",
327325
Bootstrap: &cloudnativepgv1.BootstrapConfiguration{
328326
Recovery: &cloudnativepgv1.BootstrapRecovery{
329327
Source: "source",

test/e2e/internal/tests/replicacluster/fixtures.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ func newSrcCluster(namespace string) *cloudnativepgv1.Cluster {
113113
Spec: cloudnativepgv1.ClusterSpec{
114114
Instances: 2,
115115
ImagePullPolicy: corev1.PullAlways,
116-
ImageName: "ghcr.io/cloudnative-pg/postgresql:17-minimal-bookworm",
117116
Plugins: []cloudnativepgv1.PluginConfiguration{
118117
{
119118
Name: "barman-cloud.cloudnative-pg.io",
@@ -221,7 +220,6 @@ func newReplicaCluster(namespace string) *cloudnativepgv1.Cluster {
221220
Spec: cloudnativepgv1.ClusterSpec{
222221
Instances: 2,
223222
ImagePullPolicy: corev1.PullAlways,
224-
ImageName: "ghcr.io/cloudnative-pg/postgresql:17-minimal-bookworm",
225223
Bootstrap: &cloudnativepgv1.BootstrapConfiguration{
226224
Recovery: &cloudnativepgv1.BootstrapRecovery{
227225
Source: "source",

0 commit comments

Comments
 (0)