Skip to content

Commit b913e71

Browse files
jvpasinattojvpasinatto
authored
Update default db version to PG16 instead of PG17 (#1072)
1 parent 06c2173 commit b913e71

File tree

7 files changed

+37
-37
lines changed

7 files changed

+37
-37
lines changed

‎Makefile

+6-6
Original file line numberDiff line numberDiff line change
@@ -432,17 +432,17 @@ include e2e-tests/release_versions
432432
release: generate
433433
$(SED) -i \
434434
-e "/^spec:/,/^ crVersion:/{s/crVersion: .*/crVersion: $(VERSION)/}" \
435-
-e "/^spec:/,/^ image:/{s#image: .*#image: $(IMAGE_POSTGRESQL17)#}" \
436-
-e "/^ pgBouncer:/,/^ image:/{s#image: .*#image: $(IMAGE_PGBOUNCER17)#}" \
437-
-e "/^ pgbackrest:/,/^ image:/{s#image: .*#image: $(IMAGE_PGBACKREST17)#}" \
435+
-e "/^spec:/,/^ image:/{s#image: .*#image: $(IMAGE_POSTGRESQL16)#}" \
436+
-e "/^ pgBouncer:/,/^ image:/{s#image: .*#image: $(IMAGE_PGBOUNCER16)#}" \
437+
-e "/^ pgbackrest:/,/^ image:/{s#image: .*#image: $(IMAGE_PGBACKREST16)#}" \
438438
-e "/extensions:/,/image:/{s#image: .*#image: $(IMAGE_OPERATOR)#}" \
439439
-e "/^ pmm:/,/^ image:/{s#image: .*#image: $(IMAGE_PMM_CLIENT)#}" deploy/cr.yaml
440440
$(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
441441
$(SED) -i \
442442
-e "/^spec:/,/^ image:/{s#image: .*#image: $(IMAGE_OPERATOR)#}" \
443-
-e "/^spec:/,/^ toPostgresImage:/{s#toPostgresImage: .*#toPostgresImage: $(IMAGE_POSTGRESQL17)#}" \
444-
-e "/^spec:/,/^ toPgBouncerImage:/{s#toPgBouncerImage: .*#toPgBouncerImage: $(IMAGE_PGBOUNCER17)#}" \
445-
-e "/^spec:/,/^ toPgBackRestImage:/{s#toPgBackRestImage: .*#toPgBackRestImage: $(IMAGE_PGBACKREST17)#}" deploy/upgrade.yaml
443+
-e "/^spec:/,/^ toPostgresImage:/{s#toPostgresImage: .*#toPostgresImage: $(IMAGE_POSTGRESQL16)#}" \
444+
-e "/^spec:/,/^ toPgBouncerImage:/{s#toPgBouncerImage: .*#toPgBouncerImage: $(IMAGE_PGBOUNCER16)#}" \
445+
-e "/^spec:/,/^ toPgBackRestImage:/{s#toPgBackRestImage: .*#toPgBackRestImage: $(IMAGE_PGBACKREST16)#}" deploy/upgrade.yaml
446446

447447
# Prepare main branch after release
448448
MAJOR_VER := $(shell grep -oE "crVersion: .*" deploy/cr.yaml|grep -oE "[0-9]+\.[0-9]+\.[0-9]+"|cut -d'.' -f1)

‎deploy/cr.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@ spec:
122122
# test-label: value
123123

124124

125-
image: percona/percona-postgresql-operator:2.6.0-ppg17.2-postgres
125+
image: percona/percona-postgresql-operator:2.6.0-ppg16.8-postgres
126126
imagePullPolicy: Always
127-
postgresVersion: 17
127+
postgresVersion: 16
128128
# port: 5432
129129

130130
# expose:
@@ -238,7 +238,7 @@ spec:
238238
proxy:
239239
pgBouncer:
240240
replicas: 3
241-
image: percona/percona-postgresql-operator:2.6.0-ppg17.2-pgbouncer1.23.1
241+
image: percona/percona-postgresql-operator:2.6.0-ppg16.8-pgbouncer1.24.0
242242
# exposeSuperusers: true
243243
# resources:
244244
# limits:
@@ -320,7 +320,7 @@ spec:
320320
pgbackrest:
321321
# metadata:
322322
# labels:
323-
image: percona/percona-postgresql-operator:2.6.0-ppg17.2-pgbackrest2.54.0
323+
image: percona/percona-postgresql-operator:2.6.0-ppg16.8-pgbackrest2.54.2
324324
#
325325
# containers:
326326
# pgbackrest:

‎deploy/upgrade.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ spec:
77
image: percona/percona-postgresql-operator:2.6.0
88
fromPostgresVersion: 15
99
toPostgresVersion: 16
10-
toPostgresImage: percona/percona-postgresql-operator:2.6.0-ppg17.2-postgres
11-
toPgBouncerImage: percona/percona-postgresql-operator:2.6.0-ppg17.2-pgbouncer1.23.1
12-
toPgBackRestImage: percona/percona-postgresql-operator:2.6.0-ppg17.2-pgbackrest2.54.0
10+
toPostgresImage: percona/percona-postgresql-operator:2.6.0-ppg16.8-postgres
11+
toPgBouncerImage: percona/percona-postgresql-operator:2.6.0-ppg16.8-pgbouncer1.24.0
12+
toPgBackRestImage: percona/percona-postgresql-operator:2.6.0-ppg16.8-pgbackrest2.54.2

‎e2e-tests/conf/client.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
spec:
1515
containers:
1616
- name: pg-client
17-
image: perconalab/percona-distribution-postgresql:17
17+
image: perconalab/percona-distribution-postgresql:16
1818
imagePullPolicy: Always
1919
command:
2020
- sleep

‎e2e-tests/functions

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# set root repo relatively to a test dir
44
ROOT_REPO=${ROOT_REPO:-$(realpath ../../..)}
5-
CERT_MANAGER_VER="1.17.0"
5+
CERT_MANAGER_VER="1.17.1"
66
test_name=$(basename "$(pwd)")
77
source "${ROOT_REPO}/e2e-tests/vars.sh"
88

‎e2e-tests/release_versions

+21-21
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,25 @@ IMAGE_PGBOUNCER17=percona/percona-postgresql-operator:2.6.0-ppg17.2-pgbouncer1.2
66
IMAGE_POSTGIS17=percona/percona-postgresql-operator:2.6.0-ppg17.2-postgres-gis3.3.7
77
IMAGE_BACKREST17=percona/percona-postgresql-operator:2.6.0-ppg17.2-pgbackrest2.54.0
88

9-
IMAGE_POSTGRESQL16=percona/percona-postgresql-operator:2.6.0-ppg16.6-postgres
10-
IMAGE_PGBOUNCER16=percona/percona-postgresql-operator:2.6.0-ppg16.6-pgbouncer1.23.1
11-
IMAGE_POSTGIS16=percona/percona-postgresql-operator:2.6.0-ppg16.6-postgres-gis3.3.7
12-
IMAGE_BACKREST16=percona/percona-postgresql-operator:2.6.0-ppg16.6-pgbackrest2.54.0
13-
14-
IMAGE_POSTGRESQL15=percona/percona-postgresql-operator:2.6.0-ppg15.10-postgres
15-
IMAGE_PGBOUNCER15=percona/percona-postgresql-operator:2.6.0-ppg15.10-pgbouncer1.23.1
16-
IMAGE_POSTGIS15=percona/percona-postgresql-operator:2.6.0-ppg15.10-postgres-gis3.3.7
17-
IMAGE_BACKREST15=percona/percona-postgresql-operator:2.6.0-ppg15.10-pgbackrest2.54.0
18-
19-
IMAGE_POSTGRESQL14=percona/percona-postgresql-operator:2.6.0-ppg14.15-postgres
20-
IMAGE_PGBOUNCER14=percona/percona-postgresql-operator:2.6.0-ppg14.15-pgbouncer1.23.1
21-
IMAGE_POSTGIS14=percona/percona-postgresql-operator:2.6.0-ppg14.15-postgres-gis3.3.7
22-
IMAGE_BACKREST14=percona/percona-postgresql-operator:2.6.0-ppg14.15-pgbackrest2.54.0
23-
24-
IMAGE_POSTGRESQL13=percona/percona-postgresql-operator:2.6.0-ppg13.18-postgres
25-
IMAGE_PGBOUNCER13=percona/percona-postgresql-operator:2.6.0-ppg13.18-pgbouncer1.23.1
26-
IMAGE_POSTGIS13=percona/percona-postgresql-operator:2.6.0-ppg13.18-postgres-gis3.3.7
27-
IMAGE_BACKREST13=percona/percona-postgresql-operator:2.6.0-ppg13.18-pgbackrest2.54.0
9+
IMAGE_POSTGRESQL16=percona/percona-postgresql-operator:2.6.0-ppg16.8-postgres
10+
IMAGE_PGBOUNCER16=percona/percona-postgresql-operator:2.6.0-ppg16.8-pgbouncer1.24.0
11+
IMAGE_POSTGIS16=percona/percona-postgresql-operator:2.6.0-ppg16.8-postgres-gis3.3.8
12+
IMAGE_BACKREST16=percona/percona-postgresql-operator:2.6.0-ppg16.8-pgbackrest2.54.2
13+
14+
IMAGE_POSTGRESQL15=percona/percona-postgresql-operator:2.6.0-ppg15.12-postgres
15+
IMAGE_PGBOUNCER15=percona/percona-postgresql-operator:2.6.0-ppg15.12-pgbouncer1.24.0
16+
IMAGE_POSTGIS15=percona/percona-postgresql-operator:2.6.0-ppg15.12-postgres-gis3.3.8
17+
IMAGE_BACKREST15=percona/percona-postgresql-operator:2.6.0-ppg15.12-pgbackrest2.54.2
18+
19+
IMAGE_POSTGRESQL14=percona/percona-postgresql-operator:2.6.0-ppg14.17-postgres
20+
IMAGE_PGBOUNCER14=percona/percona-postgresql-operator:2.6.0-ppg14.17-pgbouncer1.24.0
21+
IMAGE_POSTGIS14=percona/percona-postgresql-operator:2.6.0-ppg14.17-postgres-gis3.3.8
22+
IMAGE_BACKREST14=percona/percona-postgresql-operator:2.6.0-ppg14.17-pgbackrest2.54.2
23+
24+
IMAGE_POSTGRESQL13=percona/percona-postgresql-operator:2.6.0-ppg13.20-postgres
25+
IMAGE_PGBOUNCER13=percona/percona-postgresql-operator:2.6.0-ppg13.20-pgbouncer1.24.0
26+
IMAGE_POSTGIS13=percona/percona-postgresql-operator:2.6.0-ppg13.20-postgres-gis3.3.8
27+
IMAGE_BACKREST13=percona/percona-postgresql-operator:2.6.0-ppg13.20-pgbackrest2.54.2
2828

2929
IMAGE_UPGRADE=percona/percona-postgresql-operator:2.6.0-upgrade
3030

@@ -38,6 +38,6 @@ EKS_MIN=1.29
3838
EKS_MAX=1.32
3939
AKS_MIN=1.29
4040
AKS_MAX=1.31
41-
OPENSHIFT_MIN=4.14.46
42-
OPENSHIFT_MAX=4.17.16
41+
OPENSHIFT_MIN=4.14.48
42+
OPENSHIFT_MAX=4.17.19
4343
MINIKUBE_MAX=1.32.0

‎e2e-tests/vars.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export VERSION=${VERSION:-$(echo "${GIT_BRANCH}" | sed -e 's^/^-^g; s^[.]^-^g;'
1212

1313
export IMAGE_BASE=${IMAGE_BASE:-"perconalab/percona-postgresql-operator"}
1414
export IMAGE=${IMAGE:-"${IMAGE_BASE}:${VERSION}"}
15-
export PG_VER="${PG_VER:-17}"
15+
export PG_VER="${PG_VER:-16}"
1616
export IMAGE_PGBOUNCER=${IMAGE_PGBOUNCER:-"${IMAGE_BASE}:main-ppg$PG_VER-pgbouncer"}
1717
export IMAGE_POSTGRESQL=${IMAGE_POSTGRESQL:-"${IMAGE_BASE}:main-ppg$PG_VER-postgres"}
1818
export IMAGE_BACKREST=${IMAGE_BACKREST:-"${IMAGE_BASE}:main-ppg$PG_VER-pgbackrest"}

0 commit comments

Comments
 (0)