Skip to content

K8SPG-818 Update versions for 2.7.0 release #1213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: release-2.7.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -425,17 +425,17 @@ include e2e-tests/release_versions
release: generate
$(SED) -i \
-e "/^spec:/,/^ crVersion:/{s/crVersion: .*/crVersion: $(VERSION)/}" \
-e "/^spec:/,/^ image:/{s#image: .*#image: $(IMAGE_POSTGRESQL16)#}" \
-e "/^ pgBouncer:/,/^ image:/{s#image: .*#image: $(IMAGE_PGBOUNCER16)#}" \
-e "/^ pgbackrest:/,/^ image:/{s#image: .*#image: $(IMAGE_PGBACKREST16)#}" \
-e "/^spec:/,/^ image:/{s#image: .*#image: $(IMAGE_POSTGRESQL17)#}" \
-e "/^ pgBouncer:/,/^ image:/{s#image: .*#image: $(IMAGE_PGBOUNCER17)#}" \
-e "/^ pgbackrest:/,/^ image:/{s#image: .*#image: $(IMAGE_BACKREST17)#}" \
-e "/extensions:/,/image:/{s#image: .*#image: $(IMAGE_OPERATOR)#}" \
-e "/^ pmm:/,/^ image:/{s#image: .*#image: $(IMAGE_PMM_CLIENT)#}" deploy/cr.yaml
-e "/^ pmm:/,/^ image:/{s#image: .*#image: $(IMAGE_PMM3_CLIENT)#}" deploy/cr.yaml
$(SED) -i -r "/Version *= \"[0-9]+\.[0-9]+\.[0-9]+\"$$/ s/[0-9]+\.[0-9]+\.[0-9]+/$(VERSION)/" pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go
$(SED) -i \
-e "/^spec:/,/^ image:/{s#image: .*#image: $(IMAGE_OPERATOR)#}" \
-e "/^spec:/,/^ toPostgresImage:/{s#toPostgresImage: .*#toPostgresImage: $(IMAGE_POSTGRESQL16)#}" \
-e "/^spec:/,/^ toPgBouncerImage:/{s#toPgBouncerImage: .*#toPgBouncerImage: $(IMAGE_PGBOUNCER16)#}" \
-e "/^spec:/,/^ toPgBackRestImage:/{s#toPgBackRestImage: .*#toPgBackRestImage: $(IMAGE_PGBACKREST16)#}" deploy/upgrade.yaml
-e "/^spec:/,/^ toPostgresImage:/{s#toPostgresImage: .*#toPostgresImage: $(IMAGE_POSTGRESQL17)#}" \
-e "/^spec:/,/^ toPgBouncerImage:/{s#toPgBouncerImage: .*#toPgBouncerImage: $(IMAGE_PGBOUNCER17)#}" \
-e "/^spec:/,/^ toPgBackRestImage:/{s#toPgBackRestImage: .*#toPgBackRestImage: $(IMAGE_BACKREST17)#}" deploy/upgrade.yaml

# Prepare main branch after release
MAJOR_VER := $(shell grep -oE "crVersion: .*" deploy/cr.yaml|grep -oE "[0-9]+\.[0-9]+\.[0-9]+"|cut -d'.' -f1)
Expand Down
4 changes: 2 additions & 2 deletions config/bundle/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ resources:
- ../manager/namespace
images:
- name: postgres-operator
newName: perconalab/percona-postgresql-operator
newTag: main
newName: percona/percona-postgresql-operator
newTag: 2.7.0
4 changes: 2 additions & 2 deletions config/cw-bundle/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ resources:

images:
- name: postgres-operator
newName: perconalab/percona-postgresql-operator
newTag: main
newName: percona/percona-postgresql-operator
newTag: 2.7.0
4 changes: 2 additions & 2 deletions config/manager/cluster/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ patchesStrategicMerge:

images:
- name: postgres-operator
newName: perconalab/percona-postgresql-operator
newTag: main
newName: percona/percona-postgresql-operator
newTag: 2.7.0
4 changes: 2 additions & 2 deletions config/manager/namespace/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ patchesStrategicMerge:

images:
- name: postgres-operator
newName: perconalab/percona-postgresql-operator
newTag: main
newName: percona/percona-postgresql-operator
newTag: 2.7.0
2 changes: 1 addition & 1 deletion deploy/bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47581,7 +47581,7 @@ spec:
value: "false"
- name: PGO_WORKERS
value: "1"
image: perconalab/percona-postgresql-operator:main
image: percona/percona-postgresql-operator:2.7.0
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down
12 changes: 6 additions & 6 deletions deploy/cr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
spec:
crVersion: 2.7.0
# initContainer:
# image: perconalab/percona-postgresql-operator:main
# image: percona/percona-postgresql-operator:2.7.0-ppg17.5.2-postgres
# resources:
# limits:
# cpu: 2.0
Expand Down Expand Up @@ -154,7 +154,7 @@ spec:
# test-label: value


image: perconalab/percona-postgresql-operator:main-ppg17-postgres
image: percona/percona-postgresql-operator:2.7.0-ppg17.5.2-postgres
imagePullPolicy: Always
postgresVersion: 17
# port: 5432
Expand Down Expand Up @@ -304,7 +304,7 @@ spec:
proxy:
pgBouncer:
replicas: 3
image: perconalab/percona-postgresql-operator:main-pgbouncer17
image: percona/percona-pgbouncer:1.24.1
# exposeSuperusers: true
# resources:
# limits:
Expand Down Expand Up @@ -394,7 +394,7 @@ spec:
pgbackrest:
# metadata:
# labels:
image: perconalab/percona-postgresql-operator:main-pgbackrest17
image: percona/percona-pgbackrest:2.55.0
# initContainer:
# image: perconalab/percona-postgresql-operator:main
# resources:
Expand Down Expand Up @@ -585,7 +585,7 @@ spec:

pmm:
enabled: false
image: perconalab/pmm-client:dev-latest
image: percona/pmm-client:3.2.0
# imagePullPolicy: IfNotPresent
secret: cluster1-pmm-secret
serverHost: monitoring-service
Expand Down Expand Up @@ -619,7 +619,7 @@ spec:
# - basebackup

# extensions:
# image: perconalab/percona-postgresql-operator:main
# image: percona/percona-postgresql-operator:2.7.0
# imagePullPolicy: Always
# storage:
# type: s3
Expand Down
2 changes: 1 addition & 1 deletion deploy/cw-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47579,7 +47579,7 @@ spec:
value: "false"
- name: PGO_WORKERS
value: "1"
image: perconalab/percona-postgresql-operator:main
image: percona/percona-postgresql-operator:2.7.0
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down
2 changes: 1 addition & 1 deletion deploy/cw-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ spec:
value: "false"
- name: PGO_WORKERS
value: "1"
image: perconalab/percona-postgresql-operator:main
image: percona/percona-postgresql-operator:2.7.0
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down
2 changes: 1 addition & 1 deletion deploy/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ spec:
value: "false"
- name: PGO_WORKERS
value: "1"
image: perconalab/percona-postgresql-operator:main
image: percona/percona-postgresql-operator:2.7.0
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down
8 changes: 4 additions & 4 deletions deploy/upgrade.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ metadata:
name: cluster1-15-to-16
spec:
postgresClusterName: cluster1
image: perconalab/percona-postgresql-operator:main-upgrade
image: percona/percona-postgresql-operator:2.7.0-upgrade
fromPostgresVersion: 16
toPostgresVersion: 17
toPostgresImage: perconalab/percona-postgresql-operator:main-ppg17-postgres
toPgBouncerImage: perconalab/percona-postgresql-operator:main-pgbouncer17
toPgBackRestImage: perconalab/percona-postgresql-operator:main-pgbackrest17
toPostgresImage: percona/percona-postgresql-operator:2.7.0-ppg17.5.2-postgres
toPgBouncerImage: percona/percona-pgbouncer:1.24.1
toPgBackRestImage: percona/percona-pgbackrest:2.55.0
2 changes: 1 addition & 1 deletion e2e-tests/functions
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# set root repo relatively to a test dir
ROOT_REPO=${ROOT_REPO:-$(realpath ../../..)}
CERT_MANAGER_VER="1.17.1"
CERT_MANAGER_VER="1.18.2"
test_name=$(basename "$(pwd)")
source "${ROOT_REPO}/e2e-tests/vars.sh"

Expand Down
70 changes: 35 additions & 35 deletions e2e-tests/release_versions
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
# Images versions
IMAGE_OPERATOR=percona/percona-postgresql-operator:2.6.0
IMAGE_OPERATOR=percona/percona-postgresql-operator:2.7.0

IMAGE_POSTGRESQL17=percona/percona-postgresql-operator:2.6.0-ppg17.2-postgres
IMAGE_PGBOUNCER17=percona/percona-postgresql-operator:2.6.0-ppg17.2-pgbouncer1.23.1
IMAGE_POSTGIS17=percona/percona-postgresql-operator:2.6.0-ppg17.2-postgres-gis3.3.7
IMAGE_BACKREST17=percona/percona-postgresql-operator:2.6.0-ppg17.2-pgbackrest2.54.0
IMAGE_POSTGRESQL17=percona/percona-postgresql-operator:2.7.0-ppg17.5.2-postgres
IMAGE_PGBOUNCER17=percona/percona-pgbouncer:1.24.1
IMAGE_POSTGIS17=percona/percona-postgresql-operator:2.7.0-ppg17.5.2-postgres-gis3.3.8
IMAGE_BACKREST17=percona/percona-pgbackrest:2.55.0

IMAGE_POSTGRESQL16=percona/percona-postgresql-operator:2.6.0-ppg16.8-postgres
IMAGE_PGBOUNCER16=percona/percona-postgresql-operator:2.6.0-ppg16.8-pgbouncer1.24.0
IMAGE_POSTGIS16=percona/percona-postgresql-operator:2.6.0-ppg16.8-postgres-gis3.3.8
IMAGE_BACKREST16=percona/percona-postgresql-operator:2.6.0-ppg16.8-pgbackrest2.54.2
IMAGE_POSTGRESQL16=percona/percona-postgresql-operator:2.7.0-ppg16.9-postgres
IMAGE_PGBOUNCER16=percona/percona-pgbouncer:1.24.1
IMAGE_POSTGIS16=percona/percona-postgresql-operator:2.7.0-ppg16.9-postgres-gis3.3.8
IMAGE_BACKREST16=percona/percona-pgbackrest:2.55.0

IMAGE_POSTGRESQL15=percona/percona-postgresql-operator:2.6.0-ppg15.12-postgres
IMAGE_PGBOUNCER15=percona/percona-postgresql-operator:2.6.0-ppg15.12-pgbouncer1.24.0
IMAGE_POSTGIS15=percona/percona-postgresql-operator:2.6.0-ppg15.12-postgres-gis3.3.8
IMAGE_BACKREST15=percona/percona-postgresql-operator:2.6.0-ppg15.12-pgbackrest2.54.2
IMAGE_POSTGRESQL15=percona/percona-postgresql-operator:2.7.0-ppg15.13-postgres
IMAGE_PGBOUNCER15=percona/percona-pgbouncer:1.24.1
IMAGE_POSTGIS15=percona/percona-postgresql-operator:2.7.0-ppg15.13-postgres-gis3.3.8
IMAGE_BACKREST15=percona/percona-pgbackrest:2.55.0

IMAGE_POSTGRESQL14=percona/percona-postgresql-operator:2.6.0-ppg14.17-postgres
IMAGE_PGBOUNCER14=percona/percona-postgresql-operator:2.6.0-ppg14.17-pgbouncer1.24.0
IMAGE_POSTGIS14=percona/percona-postgresql-operator:2.6.0-ppg14.17-postgres-gis3.3.8
IMAGE_BACKREST14=percona/percona-postgresql-operator:2.6.0-ppg14.17-pgbackrest2.54.2
IMAGE_POSTGRESQL14=percona/percona-postgresql-operator:2.7.0-ppg14.18-postgres
IMAGE_PGBOUNCER14=percona/percona-pgbouncer:1.24.1
IMAGE_POSTGIS14=percona/percona-postgresql-operator:2.7.0-ppg14.18-postgres-gis3.3.8
IMAGE_BACKREST14=percona/percona-pgbackrest:2.55.0

IMAGE_POSTGRESQL13=percona/percona-postgresql-operator:2.6.0-ppg13.20-postgres
IMAGE_PGBOUNCER13=percona/percona-postgresql-operator:2.6.0-ppg13.20-pgbouncer1.24.0
IMAGE_POSTGIS13=percona/percona-postgresql-operator:2.6.0-ppg13.20-postgres-gis3.3.8
IMAGE_BACKREST13=percona/percona-postgresql-operator:2.6.0-ppg13.20-pgbackrest2.54.2
IMAGE_POSTGRESQL13=percona/percona-postgresql-operator:2.7.0-ppg13.21-postgres
IMAGE_PGBOUNCER13=percona/percona-pgbouncer:1.24.1
IMAGE_POSTGIS13=percona/percona-postgresql-operator:2.7.0-ppg13.21-postgres-gis3.3.8
IMAGE_BACKREST13=percona/percona-pgbackrest:2.55.0

IMAGE_UPGRADE=percona/percona-postgresql-operator:2.6.0-upgrade
IMAGE_UPGRADE=percona/percona-postgresql-operator:2.7.0-upgrade

IMAGE_PMM_CLIENT=percona/pmm-client:2.44.0
IMAGE_PMM_SERVER=percona/pmm-server:2.44.0
IMAGE_PMM3_CLIENT=percona/pmm-client:3.1.0
IMAGE_PMM3_SERVER=percona/pmm-server:3.1.0
IMAGE_PMM_CLIENT=percona/pmm-client:2.44.1
IMAGE_PMM_SERVER=percona/pmm-server:2.44.1
IMAGE_PMM3_CLIENT=percona/pmm-client:3.2.0
IMAGE_PMM3_SERVER=percona/pmm-server:3.2.0

# Supported k8s versions
GKE_MIN=1.29
GKE_MAX=1.31
EKS_MIN=1.29
EKS_MAX=1.32
AKS_MIN=1.29
AKS_MAX=1.31
OPENSHIFT_MIN=4.14.48
OPENSHIFT_MAX=4.17.19
MINIKUBE_MAX=1.32.0
GKE_MIN=1.30
GKE_MAX=1.32
EKS_MIN=1.30
EKS_MAX=1.33
AKS_MIN=1.30
AKS_MAX=1.32
OPENSHIFT_MIN=4.15.53
OPENSHIFT_MAX=4.19.2
MINIKUBE_MAX=1.33.1
Loading