Skip to content

Commit c45c574

Browse files
horshors
authored
Merge pull request #1044 from percona/release-2.6.0
K8SPG-651 - Release 2.6.0
2 parents 6a80c22 + d6b699c commit c45c574

Some content is hidden

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

46 files changed

+329
-299
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)

‎config/bundle/kustomization.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ resources:
66
- ../manager/namespace
77
images:
88
- name: postgres-operator
9-
newName: perconalab/percona-postgresql-operator
10-
newTag: main
9+
newName: percona/percona-postgresql-operator
10+
newTag: 2.6.0

‎config/cw-bundle/kustomization.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ resources:
77

88
images:
99
- name: postgres-operator
10-
newName: perconalab/percona-postgresql-operator
11-
newTag: main
10+
newName: percona/percona-postgresql-operator
11+
newTag: 2.6.0

‎config/manager/cluster/kustomization.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ patchesStrategicMerge:
88

99
images:
1010
- name: postgres-operator
11-
newName: perconalab/percona-postgresql-operator
12-
newTag: main
11+
newName: percona/percona-postgresql-operator
12+
newTag: 2.6.0

‎config/manager/namespace/kustomization.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ patchesStrategicMerge:
99

1010
images:
1111
- name: postgres-operator
12-
newName: perconalab/percona-postgresql-operator
13-
newTag: main
12+
newName: percona/percona-postgresql-operator
13+
newTag: 2.6.0

‎deploy/bundle.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45993,7 +45993,7 @@ spec:
4599345993
value: INFO
4599445994
- name: DISABLE_TELEMETRY
4599545995
value: "false"
45996-
image: perconalab/percona-postgresql-operator:main
45996+
image: percona/percona-postgresql-operator:2.6.0
4599745997
imagePullPolicy: Always
4599845998
livenessProbe:
4599945999
failureThreshold: 3

‎deploy/cr.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ spec:
124124
# test-label: value
125125

126126

127-
image: perconalab/percona-postgresql-operator:main-ppg17-postgres
127+
image: percona/percona-postgresql-operator:2.6.0-ppg16.8-postgres
128128
imagePullPolicy: Always
129-
postgresVersion: 17
129+
postgresVersion: 16
130130
# port: 5432
131131

132132
# expose:
@@ -240,7 +240,7 @@ spec:
240240
proxy:
241241
pgBouncer:
242242
replicas: 3
243-
image: perconalab/percona-postgresql-operator:main-ppg17-pgbouncer
243+
image: percona/percona-postgresql-operator:2.6.0-ppg16.8-pgbouncer1.24.0
244244
# exposeSuperusers: true
245245
# resources:
246246
# limits:
@@ -322,7 +322,7 @@ spec:
322322
pgbackrest:
323323
# metadata:
324324
# labels:
325-
image: perconalab/percona-postgresql-operator:main-ppg17-pgbackrest
325+
image: percona/percona-postgresql-operator:2.6.0-ppg16.8-pgbackrest2.54.2
326326
#
327327
# containers:
328328
# pgbackrest:
@@ -467,13 +467,13 @@ spec:
467467

468468
pmm:
469469
enabled: false
470-
image: perconalab/pmm-client:dev-latest
470+
image: percona/pmm-client:2.44.0
471471
# imagePullPolicy: IfNotPresent
472472
secret: cluster1-pmm-secret
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.
@@ -489,7 +489,7 @@ spec:
489489
# work_mem: 2MB
490490

491491
# extensions:
492-
# image: perconalab/percona-postgresql-operator:main
492+
# image: percona/percona-postgresql-operator:2.6.0
493493
# imagePullPolicy: Always
494494
# storage:
495495
# type: s3

‎deploy/cw-bundle.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45991,7 +45991,7 @@ spec:
4599145991
value: INFO
4599245992
- name: DISABLE_TELEMETRY
4599345993
value: "false"
45994-
image: perconalab/percona-postgresql-operator:main
45994+
image: percona/percona-postgresql-operator:2.6.0
4599545995
imagePullPolicy: Always
4599645996
livenessProbe:
4599745997
failureThreshold: 3

‎deploy/cw-operator.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ spec:
4242
value: INFO
4343
- name: DISABLE_TELEMETRY
4444
value: "false"
45-
image: perconalab/percona-postgresql-operator:main
45+
image: percona/percona-postgresql-operator:2.6.0
4646
imagePullPolicy: Always
4747
livenessProbe:
4848
failureThreshold: 3

‎deploy/operator.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ spec:
4545
value: INFO
4646
- name: DISABLE_TELEMETRY
4747
value: "false"
48-
image: perconalab/percona-postgresql-operator:main
48+
image: percona/percona-postgresql-operator:2.6.0
4949
imagePullPolicy: Always
5050
livenessProbe:
5151
failureThreshold: 3

‎deploy/upgrade.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ metadata:
44
name: cluster1-15-to-16
55
spec:
66
postgresClusterName: cluster1
7-
image: perconalab/percona-postgresql-operator:main
7+
image: percona/percona-postgresql-operator:2.6.0
88
fromPostgresVersion: 15
99
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
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:15
17+
image: perconalab/percona-distribution-postgresql:16
1818
imagePullPolicy: Always
1919
command:
2020
- sleep

‎e2e-tests/functions

+13-3
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

+23-22
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

+1
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/migration-backup-s3/09-deploy-cluster.yaml

+9-1
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

+1
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

‎e2e-tests/tests/scheduled-backup/07-add-sleep.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
apiVersion: kuttl.dev/v1beta1
2+
kind: TestStep
3+
commands:
4+
- script: |-
5+
set -o errexit
6+
set -o xtrace
7+
8+
sleep 2

‎e2e-tests/tests/scheduled-backup/07-assert.yaml

-42
This file was deleted.

0 commit comments

Comments
 (0)