Skip to content

Commit ec79b07

Browse files
horshors
authored
Merge branch 'main' into K8SPG-612-pgbouncer
2 parents 53f2af8 + 38b292d commit ec79b07

50 files changed

Lines changed: 332 additions & 302 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile‎

Lines changed: 6 additions & 6 deletions
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‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
# - percona.com/delete-ssl
1010
# - percona.com/delete-backups
1111
spec:
12-
crVersion: 2.6.0
12+
crVersion: 2.7.0
1313
# metadata:
1414
# annotations:
1515
# example-annotation: value
@@ -473,7 +473,7 @@ spec:
473473
serverHost: monitoring-service
474474
# querySource: pgstatmonitor
475475
# patroni:
476-
# # Some values of the Liveness/Readiness probes of the patroni container are calulated using syncPeriodSeconds by the following formulas:
476+
# # Some values of the Liveness/Readiness probes of the patroni container are calculated using syncPeriodSeconds by the following formulas:
477477
# # - timeoutSeconds: syncPeriodSeconds / 2;
478478
# # - periodSeconds: syncPeriodSeconds;
479479
# # - failureThreshold: leaderLeaseDurationSeconds / syncPeriodSeconds.

‎deploy/upgrade.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ metadata:
55
spec:
66
postgresClusterName: cluster1
77
image: perconalab/percona-postgresql-operator:main
8-
fromPostgresVersion: 15
9-
toPostgresVersion: 16
10-
toPostgresImage: perconalab/percona-postgresql-operator:main-ppg16-postgres
11-
toPgBouncerImage: perconalab/percona-postgresql-operator:main-ppg16-pgbouncer
12-
toPgBackRestImage: perconalab/percona-postgresql-operator:main-ppg16-pgbackrest
8+
fromPostgresVersion: 16
9+
toPostgresVersion: 17
10+
toPostgresImage: perconalab/percona-postgresql-operator:main-ppg17-postgres
11+
toPgBouncerImage: perconalab/percona-postgresql-operator:main-ppg17-pgbouncer
12+
toPgBackRestImage: perconalab/percona-postgresql-operator:main-ppg17-pgbackrest

‎e2e-tests/conf/client.yaml‎

Lines changed: 1 addition & 1 deletion
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:15
17+
image: perconalab/percona-distribution-postgresql:16
1818
imagePullPolicy: Always
1919
command:
2020
- sleep

‎e2e-tests/functions‎

Lines changed: 13 additions & 3 deletions
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.15.3"
5+
CERT_MANAGER_VER="1.17.1"
66
test_name=$(basename "$(pwd)")
77
source "${ROOT_REPO}/e2e-tests/vars.sh"
88

@@ -386,9 +386,19 @@ get_metric_values() {
386386
local end=$($date -u "+%s")
387387
local endpoint=$(get_service_ip monitoring-service)
388388

389-
curl -s -k -H "Authorization: Bearer ${api_key}" "https://$endpoint/graph/api/datasources/proxy/1/api/v1/query_range?query=min%28$metric%7Bnode_name%3D%7E%22$instance%22%7d%20or%20$metric%7Bnode_name%3D%7E%22$instance%22%7D%29&start=$start&end=$end&step=60" \
389+
local wait_count=20
390+
local retry=0
391+
until [[ $(curl -s -k -H "Authorization: Bearer ${api_key}" "https://$endpoint/graph/api/datasources/proxy/1/api/v1/query_range?query=min%28$metric%7Bnode_name%3D%7E%22$instance%22%7d%20or%20$metric%7Bnode_name%3D%7E%22$instance%22%7D%29&start=$start&end=$end&step=60" \
390392
| jq '.data.result[0].values[][1]' \
391-
| grep '^"[0-9]'
393+
| grep '^"[0-9]') ]]; do
394+
sleep 2
395+
local start=$($date -u "+%s" -d "-5 minute")
396+
local end=$($date -u "+%s")
397+
let retry+=1
398+
if [[ $retry -ge $wait_count ]]; then
399+
exit 1
400+
fi
401+
done
392402
}
393403

394404
get_qan20_values() {

‎e2e-tests/release_versions‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,31 @@
1-
#Image versions
1+
# Images versions
2+
IMAGE_OPERATOR=percona/percona-postgresql-operator:2.6.0
3+
24
IMAGE_POSTGRESQL17=percona/percona-postgresql-operator:2.6.0-ppg17.2-postgres
35
IMAGE_PGBOUNCER17=percona/percona-postgresql-operator:2.6.0-ppg17.2-pgbouncer1.23.1
46
IMAGE_POSTGIS17=percona/percona-postgresql-operator:2.6.0-ppg17.2-postgres-gis3.3.7
5-
IMAGE_PGBACKREST17=percona/percona-postgresql-operator:2.6.0-ppg17.2-pgbackrest2.54.0
7+
IMAGE_BACKREST17=percona/percona-postgresql-operator:2.6.0-ppg17.2-pgbackrest2.54.0
68

7-
IMAGE_POSTGRESQL16=percona/percona-postgresql-operator:2.6.0-ppg16.6-postgres
8-
IMAGE_PGBOUNCER16=percona/percona-postgresql-operator:2.6.0-ppg16.6-pgbouncer1.23.1
9-
IMAGE_POSTGIS16=percona/percona-postgresql-operator:2.6.0-ppg16.6-postgres-gis3.3.7
10-
IMAGE_PGBACKREST16=percona/percona-postgresql-operator:2.6.0-ppg16.6-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
1113

12-
IMAGE_POSTGRESQL15=percona/percona-postgresql-operator:2.6.0-ppg15.10-postgres
13-
IMAGE_PGBOUNCER15=percona/percona-postgresql-operator:2.6.0-ppg15.10-pgbouncer1.23.1
14-
IMAGE_POSTGIS15=percona/percona-postgresql-operator:2.6.0-ppg15.10-postgres-gis3.3.7
15-
IMAGE_PGBACKREST15=percona/percona-postgresql-operator:2.6.0-ppg15.10-pgbackrest2.54.0
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
1618

17-
IMAGE_POSTGRESQL14=percona/percona-postgresql-operator:2.6.0-ppg14.15-postgres
18-
IMAGE_PGBOUNCER14=percona/percona-postgresql-operator:2.6.0-ppg14.15-pgbouncer1.23.1
19-
IMAGE_POSTGIS14=percona/percona-postgresql-operator:2.6.0-ppg14.15-postgres-gis3.3.7
20-
IMAGE_PGBACKREST14=percona/percona-postgresql-operator:2.6.0-ppg14.15-pgbackrest2.54.0
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
2123

22-
IMAGE_POSTGRESQL13=percona/percona-postgresql-operator:2.6.0-ppg13.18-postgres
23-
IMAGE_PGBOUNCER13=percona/percona-postgresql-operator:2.6.0-ppg13.18-pgbouncer1.23.1
24-
IMAGE_POSTGIS13=percona/percona-postgresql-operator:2.6.0-ppg13.18-postgres-gis3.3.7
25-
IMAGE_PGBACKREST13=percona/percona-postgresql-operator:2.6.0-ppg13.18-pgbackrest2.54.0
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
2628

27-
IMAGE_OPERATOR=percona/percona-postgresql-operator:2.6.0
2829
IMAGE_UPGRADE=percona/percona-postgresql-operator:2.6.0-upgrade
2930

3031
IMAGE_PMM_CLIENT=percona/pmm-client:2.44.0
@@ -37,6 +38,6 @@ EKS_MIN=1.29
3738
EKS_MAX=1.32
3839
AKS_MIN=1.29
3940
AKS_MAX=1.31
40-
OPENSHIFT_MIN=4.14.46
41-
OPENSHIFT_MAX=4.17.15
42-
MINIKUBE_REL=1.32.0
41+
OPENSHIFT_MIN=4.14.48
42+
OPENSHIFT_MAX=4.17.19
43+
MINIKUBE_MAX=1.32.0

‎e2e-tests/tests/demand-backup/25-delete-cluster-with-finalizer.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ commands:
1717
fi
1818
1919
kubectl create configmap -n "${NAMESPACE}" 25-pg-backup-objects --from-literal=data="${data}"
20+
timeout: 360

‎e2e-tests/tests/init-deploy/05-assert.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ metadata:
1212
app.kubernetes.io/managed-by: percona-postgresql-operator
1313
app.kubernetes.io/name: percona-postgresql
1414
app.kubernetes.io/part-of: percona-postgresql
15-
pgv2.percona.com/version: 2.6.0
15+
pgv2.percona.com/version: 2.7.0
1616
postgres-operator.crunchydata.com/cluster: init-deploy
1717
postgres-operator.crunchydata.com/pgbackrest: ""
1818
postgres-operator.crunchydata.com/pgbackrest-config: ""
@@ -81,7 +81,7 @@ metadata:
8181
app.kubernetes.io/managed-by: percona-postgresql-operator
8282
app.kubernetes.io/name: percona-postgresql
8383
app.kubernetes.io/part-of: percona-postgresql
84-
pgv2.percona.com/version: 2.6.0
84+
pgv2.percona.com/version: 2.7.0
8585
postgres-operator.crunchydata.com/cluster: init-deploy
8686
postgres-operator.crunchydata.com/role: pgbouncer
8787
test-label: test
@@ -144,7 +144,7 @@ metadata:
144144
app.kubernetes.io/managed-by: percona-postgresql-operator
145145
app.kubernetes.io/name: percona-postgresql
146146
app.kubernetes.io/part-of: percona-postgresql
147-
pgv2.percona.com/version: 2.6.0
147+
pgv2.percona.com/version: 2.7.0
148148
postgres-operator.crunchydata.com/cluster: init-deploy
149149
postgres-operator.crunchydata.com/pgbackrest: ""
150150
postgres-operator.crunchydata.com/pgbackrest-config: ""
@@ -168,7 +168,7 @@ metadata:
168168
app.kubernetes.io/managed-by: percona-postgresql-operator
169169
app.kubernetes.io/name: percona-postgresql
170170
app.kubernetes.io/part-of: percona-postgresql
171-
pgv2.percona.com/version: 2.6.0
171+
pgv2.percona.com/version: 2.7.0
172172
postgres-operator.crunchydata.com/cluster: init-deploy
173173
postgres-operator.crunchydata.com/role: pgbouncer
174174
test-label: test
@@ -191,7 +191,7 @@ metadata:
191191
app.kubernetes.io/managed-by: percona-postgresql-operator
192192
app.kubernetes.io/name: percona-postgresql
193193
app.kubernetes.io/part-of: percona-postgresql
194-
pgv2.percona.com/version: 2.6.0
194+
pgv2.percona.com/version: 2.7.0
195195
postgres-operator.crunchydata.com/cluster: init-deploy
196196
postgres-operator.crunchydata.com/data: pgbackrest
197197
postgres-operator.crunchydata.com/pgbackrest: ""
@@ -214,7 +214,7 @@ spec:
214214
app.kubernetes.io/managed-by: percona-postgresql-operator
215215
app.kubernetes.io/name: percona-postgresql
216216
app.kubernetes.io/part-of: percona-postgresql
217-
pgv2.percona.com/version: 2.6.0
217+
pgv2.percona.com/version: 2.7.0
218218
postgres-operator.crunchydata.com/cluster: init-deploy
219219
postgres-operator.crunchydata.com/data: pgbackrest
220220
postgres-operator.crunchydata.com/pgbackrest: ""

‎e2e-tests/tests/migration-backup-s3/09-deploy-cluster.yaml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,14 @@ commands:
2222
' - |
2323
kubectl -n $NAMESPACE apply -f -
2424
25-
sleep 5
25+
wait_time=20
26+
retry=0
27+
until [[ $(kubectl get job -n $NAMESPACE | grep 'migration-backup-s3-pgbackrest-restore') ]]; do
28+
sleep 1
29+
let retry+=1
30+
if [[ $retry -ge $wait_time ]]; then
31+
exit 1
32+
fi
33+
done
2634
kubectl -n $NAMESPACE wait --for=condition=Complete job/migration-backup-s3-pgbackrest-restore --timeout=360s
2735
timeout: 300

‎e2e-tests/tests/monitoring/06-check-pgstatstatements-query-source.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ commands:
1515
primary=$(get_pod_by_role monitoring primary name)
1616
res=$(kubectl -n ${NAMESPACE} exec ${primary} -- bash -c 'psql -c "SELECT extname FROM pg_extension;"')
1717
echo ${res} | grep -q pg_stat_statements
18+
timeout: 360

0 commit comments

Comments
 (0)