Skip to content

Commit 92d1256

Browse files
jvpasinattojvpasinatto
authored
K8SPG-818 Update versions for 2.7.0 release (#1213)
* K8SPG-818 Update versions for 2.7.0 release * Fix pg17 image tag
1 parent 899025a commit 92d1256

File tree

13 files changed

+65
-65
lines changed

13 files changed

+65
-65
lines changed

‎Makefile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -425,17 +425,17 @@ include e2e-tests/release_versions
425425
release: generate
426426
$(SED) -i \
427427
-e "/^spec:/,/^ crVersion:/{s/crVersion: .*/crVersion: $(VERSION)/}" \
428-
-e "/^spec:/,/^ image:/{s#image: .*#image: $(IMAGE_POSTGRESQL16)#}" \
429-
-e "/^ pgBouncer:/,/^ image:/{s#image: .*#image: $(IMAGE_PGBOUNCER16)#}" \
430-
-e "/^ pgbackrest:/,/^ image:/{s#image: .*#image: $(IMAGE_PGBACKREST16)#}" \
428+
-e "/^spec:/,/^ image:/{s#image: .*#image: $(IMAGE_POSTGRESQL17)#}" \
429+
-e "/^ pgBouncer:/,/^ image:/{s#image: .*#image: $(IMAGE_PGBOUNCER17)#}" \
430+
-e "/^ pgbackrest:/,/^ image:/{s#image: .*#image: $(IMAGE_BACKREST17)#}" \
431431
-e "/extensions:/,/image:/{s#image: .*#image: $(IMAGE_OPERATOR)#}" \
432-
-e "/^ pmm:/,/^ image:/{s#image: .*#image: $(IMAGE_PMM_CLIENT)#}" deploy/cr.yaml
432+
-e "/^ pmm:/,/^ image:/{s#image: .*#image: $(IMAGE_PMM3_CLIENT)#}" deploy/cr.yaml
433433
$(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
434434
$(SED) -i \
435435
-e "/^spec:/,/^ image:/{s#image: .*#image: $(IMAGE_OPERATOR)#}" \
436-
-e "/^spec:/,/^ toPostgresImage:/{s#toPostgresImage: .*#toPostgresImage: $(IMAGE_POSTGRESQL16)#}" \
437-
-e "/^spec:/,/^ toPgBouncerImage:/{s#toPgBouncerImage: .*#toPgBouncerImage: $(IMAGE_PGBOUNCER16)#}" \
438-
-e "/^spec:/,/^ toPgBackRestImage:/{s#toPgBackRestImage: .*#toPgBackRestImage: $(IMAGE_PGBACKREST16)#}" deploy/upgrade.yaml
436+
-e "/^spec:/,/^ toPostgresImage:/{s#toPostgresImage: .*#toPostgresImage: $(IMAGE_POSTGRESQL17)#}" \
437+
-e "/^spec:/,/^ toPgBouncerImage:/{s#toPgBouncerImage: .*#toPgBouncerImage: $(IMAGE_PGBOUNCER17)#}" \
438+
-e "/^spec:/,/^ toPgBackRestImage:/{s#toPgBackRestImage: .*#toPgBackRestImage: $(IMAGE_BACKREST17)#}" deploy/upgrade.yaml
439439

440440
# Prepare main branch after release
441441
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.7.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.7.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.7.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.7.0

‎deploy/bundle.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47581,7 +47581,7 @@ spec:
4758147581
value: "false"
4758247582
- name: PGO_WORKERS
4758347583
value: "1"
47584-
image: perconalab/percona-postgresql-operator:main
47584+
image: percona/percona-postgresql-operator:2.7.0
4758547585
imagePullPolicy: Always
4758647586
livenessProbe:
4758747587
failureThreshold: 3

‎deploy/cr.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ metadata:
1111
spec:
1212
crVersion: 2.7.0
1313
# initContainer:
14-
# image: perconalab/percona-postgresql-operator:main
14+
# image: percona/percona-postgresql-operator:2.7.0-ppg17.5.2-postgres
1515
# resources:
1616
# limits:
1717
# cpu: 2.0
@@ -154,7 +154,7 @@ spec:
154154
# test-label: value
155155

156156

157-
image: perconalab/percona-postgresql-operator:main-ppg17-postgres
157+
image: percona/percona-postgresql-operator:2.7.0-ppg17.5.2-postgres
158158
imagePullPolicy: Always
159159
postgresVersion: 17
160160
# port: 5432
@@ -304,7 +304,7 @@ spec:
304304
proxy:
305305
pgBouncer:
306306
replicas: 3
307-
image: perconalab/percona-postgresql-operator:main-pgbouncer17
307+
image: percona/percona-pgbouncer:1.24.1
308308
# exposeSuperusers: true
309309
# resources:
310310
# limits:
@@ -394,7 +394,7 @@ spec:
394394
pgbackrest:
395395
# metadata:
396396
# labels:
397-
image: perconalab/percona-postgresql-operator:main-pgbackrest17
397+
image: percona/percona-pgbackrest:2.55.0
398398
# initContainer:
399399
# image: perconalab/percona-postgresql-operator:main
400400
# resources:
@@ -585,7 +585,7 @@ spec:
585585

586586
pmm:
587587
enabled: false
588-
image: perconalab/pmm-client:dev-latest
588+
image: percona/pmm-client:3.2.0
589589
# imagePullPolicy: IfNotPresent
590590
secret: cluster1-pmm-secret
591591
serverHost: monitoring-service
@@ -619,7 +619,7 @@ spec:
619619
# - basebackup
620620

621621
# extensions:
622-
# image: perconalab/percona-postgresql-operator:main
622+
# image: percona/percona-postgresql-operator:2.7.0
623623
# imagePullPolicy: Always
624624
# storage:
625625
# type: s3

‎deploy/cw-bundle.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47579,7 +47579,7 @@ spec:
4757947579
value: "false"
4758047580
- name: PGO_WORKERS
4758147581
value: "1"
47582-
image: perconalab/percona-postgresql-operator:main
47582+
image: percona/percona-postgresql-operator:2.7.0
4758347583
imagePullPolicy: Always
4758447584
livenessProbe:
4758547585
failureThreshold: 3

‎deploy/cw-operator.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ spec:
4444
value: "false"
4545
- name: PGO_WORKERS
4646
value: "1"
47-
image: perconalab/percona-postgresql-operator:main
47+
image: percona/percona-postgresql-operator:2.7.0
4848
imagePullPolicy: Always
4949
livenessProbe:
5050
failureThreshold: 3

‎deploy/operator.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ spec:
4747
value: "false"
4848
- name: PGO_WORKERS
4949
value: "1"
50-
image: perconalab/percona-postgresql-operator:main
50+
image: percona/percona-postgresql-operator:2.7.0
5151
imagePullPolicy: Always
5252
livenessProbe:
5353
failureThreshold: 3

0 commit comments

Comments
 (0)