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

46 files changed

Lines changed: 329 additions & 299 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)

‎config/bundle/kustomization.yaml‎

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

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

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

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

Lines changed: 1 addition & 1 deletion
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‎

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

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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

0 commit comments

Comments
 (0)