fix(e2e): avoid pinpointing the PostgreSQL version (#562)

Signed-off-by: Leonardo Cecchi <leonardo.cecchi@enterprisedb.com>
This commit is contained in:
Leonardo Cecchi 2025-10-03 18:08:21 +02:00 committed by GitHub
parent 69970395e2
commit 5276dd17cf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 1 additions and 5 deletions

View File

@ -14,7 +14,7 @@ trap 'rm -rf -- "$MYTMPDIR"' EXIT
current_context=$(kubectl config view --raw -o json | jq -r '."current-context"' | sed "s/kind-//") 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) 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 # Now we deploy the plugin inside the `cnpg-system` workspace
( (

View File

@ -286,7 +286,6 @@ func newSrcClusterWithPlugin(namespace string) *cloudnativepgv1.Cluster {
Spec: cloudnativepgv1.ClusterSpec{ Spec: cloudnativepgv1.ClusterSpec{
Instances: 2, Instances: 2,
ImagePullPolicy: corev1.PullAlways, ImagePullPolicy: corev1.PullAlways,
ImageName: "ghcr.io/cloudnative-pg/postgresql:17-minimal-bookworm",
Plugins: []cloudnativepgv1.PluginConfiguration{ Plugins: []cloudnativepgv1.PluginConfiguration{
{ {
Name: "barman-cloud.cloudnative-pg.io", Name: "barman-cloud.cloudnative-pg.io",
@ -323,7 +322,6 @@ func newDstClusterWithPlugin(namespace string) *cloudnativepgv1.Cluster {
Spec: cloudnativepgv1.ClusterSpec{ Spec: cloudnativepgv1.ClusterSpec{
Instances: 2, Instances: 2,
ImagePullPolicy: corev1.PullAlways, ImagePullPolicy: corev1.PullAlways,
ImageName: "ghcr.io/cloudnative-pg/postgresql:17-minimal-bookworm",
Bootstrap: &cloudnativepgv1.BootstrapConfiguration{ Bootstrap: &cloudnativepgv1.BootstrapConfiguration{
Recovery: &cloudnativepgv1.BootstrapRecovery{ Recovery: &cloudnativepgv1.BootstrapRecovery{
Source: "source", Source: "source",

View File

@ -113,7 +113,6 @@ func newSrcCluster(namespace string) *cloudnativepgv1.Cluster {
Spec: cloudnativepgv1.ClusterSpec{ Spec: cloudnativepgv1.ClusterSpec{
Instances: 2, Instances: 2,
ImagePullPolicy: corev1.PullAlways, ImagePullPolicy: corev1.PullAlways,
ImageName: "ghcr.io/cloudnative-pg/postgresql:17-minimal-bookworm",
Plugins: []cloudnativepgv1.PluginConfiguration{ Plugins: []cloudnativepgv1.PluginConfiguration{
{ {
Name: "barman-cloud.cloudnative-pg.io", Name: "barman-cloud.cloudnative-pg.io",
@ -221,7 +220,6 @@ func newReplicaCluster(namespace string) *cloudnativepgv1.Cluster {
Spec: cloudnativepgv1.ClusterSpec{ Spec: cloudnativepgv1.ClusterSpec{
Instances: 2, Instances: 2,
ImagePullPolicy: corev1.PullAlways, ImagePullPolicy: corev1.PullAlways,
ImageName: "ghcr.io/cloudnative-pg/postgresql:17-minimal-bookworm",
Bootstrap: &cloudnativepgv1.BootstrapConfiguration{ Bootstrap: &cloudnativepgv1.BootstrapConfiguration{
Recovery: &cloudnativepgv1.BootstrapRecovery{ Recovery: &cloudnativepgv1.BootstrapRecovery{
Source: "source", Source: "source",