Skip to content

Commit 62970c9

Browse files
jvpasinattoJNKPercona
jvpasinatto
and
JNKPercona
authored
K8SPG-898 Update Versions for release 2.9.0 (#1528)
* Update images for 2.9.0 release * Fix versions * Update to PG 18 * Update cert-manager test dependency --------- Co-authored-by: JNKPercona <jenkins@percona.com>
1 parent 79d8f35 commit 62970c9

14 files changed

Lines changed: 70 additions & 76 deletions

File tree

‎Makefile‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -448,22 +448,24 @@ update-version:
448448

449449
# Prepare release
450450
PG_VER ?= $(shell grep -o "postgresVersion: .*" deploy/cr.yaml|grep -oE "[0-9]+")
451+
CERT_MANAGER_VER := $(shell grep -Eo "cert-manager v.*" go.mod|grep -Eo "[0-9]+\.[0-9]+\.[0-9]+")
451452
include e2e-tests/release_versions
452453
release: generate
454+
$(SED) -i "/CERT_MANAGER_VER/s/CERT_MANAGER_VER=\".*/CERT_MANAGER_VER=\"$(CERT_MANAGER_VER)\"/" e2e-tests/functions
453455
$(SED) -i \
454456
-e "/^spec:/,/^ crVersion:/{s/crVersion: .*/crVersion: $(VERSION)/}" \
455-
-e "/^spec:/,/^ image:/{/^#/! s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_POSTGRESQL17)#}" \
457+
-e "/^spec:/,/^ image:/{/^#/! s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_POSTGRESQL18)#}" \
456458
-e "s| image: docker.io/perconalab/percona-postgresql-operator:main| image: $(IMAGE)|" \
457-
-e "/^ pgBouncer:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_PGBOUNCER17)#}" \
458-
-e "/^ pgbackrest:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_BACKREST17)#}" \
459+
-e "/^ pgBouncer:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_PGBOUNCER18)#}" \
460+
-e "/^ pgbackrest:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_BACKREST18)#}" \
459461
-e "/extensions:/,/image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_OPERATOR)#}" \
460462
-e "/^ pmm:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_PMM3_CLIENT)#}" deploy/cr.yaml
461463
$(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
462464
$(SED) -i \
463465
-e "/^spec:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_UPGRADE)#}" \
464-
-e "/^spec:/,/^ toPostgresImage:/{s#toPostgresImage: .*#toPostgresImage: $(REGISTRY_NAME_FULL)$(IMAGE_POSTGRESQL17)#}" \
465-
-e "/^spec:/,/^ toPgBouncerImage:/{s#toPgBouncerImage: .*#toPgBouncerImage: $(REGISTRY_NAME_FULL)$(IMAGE_PGBOUNCER17)#}" \
466-
-e "/^spec:/,/^ toPgBackRestImage:/{s#toPgBackRestImage: .*#toPgBackRestImage: $(REGISTRY_NAME_FULL)$(IMAGE_BACKREST17)#}" deploy/upgrade.yaml
466+
-e "/^spec:/,/^ toPostgresImage:/{s#toPostgresImage: .*#toPostgresImage: $(REGISTRY_NAME_FULL)$(IMAGE_POSTGRESQL18)#}" \
467+
-e "/^spec:/,/^ toPgBouncerImage:/{s#toPgBouncerImage: .*#toPgBouncerImage: $(REGISTRY_NAME_FULL)$(IMAGE_PGBOUNCER18)#}" \
468+
-e "/^spec:/,/^ toPgBackRestImage:/{s#toPgBackRestImage: .*#toPgBackRestImage: $(REGISTRY_NAME_FULL)$(IMAGE_BACKREST18)#}" deploy/upgrade.yaml
467469

468470
# Prepare main branch after release
469471
CURRENT_VERSION := $(shell grep -oE "crVersion: [0-9]+\.[0-9]+\.[0-9]+" deploy/cr.yaml | grep -oE "[0-9]+\.[0-9]+\.[0-9]+")

‎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: docker.io/perconalab/percona-postgresql-operator
10-
newTag: main
9+
newName: docker.io/percona/percona-postgresql-operator
10+
newTag: 2.9.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: docker.io/perconalab/percona-postgresql-operator
11-
newTag: main
10+
newName: docker.io/percona/percona-postgresql-operator
11+
newTag: 2.9.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: docker.io/perconalab/percona-postgresql-operator
12-
newTag: main
11+
newName: docker.io/percona/percona-postgresql-operator
12+
newTag: 2.9.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: docker.io/perconalab/percona-postgresql-operator
13-
newTag: main
12+
newName: docker.io/percona/percona-postgresql-operator
13+
newTag: 2.9.0

‎deploy/bundle.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69573,7 +69573,7 @@ spec:
6957369573
value: 10s
6957469574
- name: PGO_FEATURE_GATES
6957569575
value: ""
69576-
image: docker.io/perconalab/percona-postgresql-operator:main
69576+
image: docker.io/percona/percona-postgresql-operator:2.9.0
6957769577
imagePullPolicy: Always
6957869578
livenessProbe:
6957969579
failureThreshold: 3

‎deploy/cr.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ spec:
1212
crVersion: 2.9.0
1313
# clusterServiceDNSSuffix: cluster.local
1414
# initContainer:
15-
# image: docker.io/perconalab/percona-postgresql-operator:main
15+
# image: docker.io/percona/percona-postgresql-operator:2.9.0
1616
# resources:
1717
# limits:
1818
# cpu: 2.0
@@ -183,7 +183,7 @@ spec:
183183
# test-label: value
184184

185185

186-
image: docker.io/perconalab/percona-postgresql-operator:main-ppg17-postgres
186+
image: docker.io/percona/percona-distribution-postgresql:18.3-1
187187
imagePullPolicy: Always
188188
postgresVersion: 17
189189
# port: 5432
@@ -217,7 +217,7 @@ spec:
217217
# - secretRef:
218218
# name: instance-env-secret
219219
# initContainer:
220-
# image: docker.io/perconalab/percona-postgresql-operator:main
220+
# image: docker.io/percona/percona-postgresql-operator:2.9.0
221221
# resources:
222222
# limits:
223223
# cpu: 2.0
@@ -366,7 +366,7 @@ spec:
366366
proxy:
367367
pgBouncer:
368368
replicas: 3
369-
image: docker.io/perconalab/percona-postgresql-operator:main-pgbouncer17
369+
image: docker.io/percona/percona-pgbouncer:1.25.1-1
370370
# env:
371371
# - name: MY_ENV
372372
# value: "1000"
@@ -492,15 +492,15 @@ spec:
492492
pgbackrest:
493493
# metadata:
494494
# labels:
495-
image: docker.io/perconalab/percona-postgresql-operator:main-pgbackrest17
495+
image: docker.io/percona/percona-pgbackrest:2.58.0-1
496496
# env:
497497
# - name: MY_ENV
498498
# value: "1000"
499499
# envFrom:
500500
# - secretRef:
501501
# name: repo-host-env-secret
502502
# initContainer:
503-
# image: docker.io/perconalab/percona-postgresql-operator:main
503+
# image: docker.io/percona/percona-postgresql-operator:2.9.0
504504
# resources:
505505
# limits:
506506
# cpu: 2.0
@@ -721,7 +721,7 @@ spec:
721721

722722
pmm:
723723
enabled: false
724-
image: docker.io/perconalab/pmm-client:dev-latest
724+
image: docker.io/percona/pmm-client:3.6.0
725725
# imagePullPolicy: IfNotPresent
726726
secret: cluster1-pmm-secret
727727
serverHost: monitoring-service
@@ -755,7 +755,7 @@ spec:
755755
# - basebackup
756756

757757
# extensions:
758-
# image: docker.io/perconalab/percona-postgresql-operator:main
758+
# image: docker.io/percona/percona-postgresql-operator:2.9.0
759759
# imagePullPolicy: Always
760760
# storage:
761761
# type: s3

‎deploy/cw-bundle.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69571,7 +69571,7 @@ spec:
6957169571
value: 10s
6957269572
- name: PGO_FEATURE_GATES
6957369573
value: ""
69574-
image: docker.io/perconalab/percona-postgresql-operator:main
69574+
image: docker.io/percona/percona-postgresql-operator:2.9.0
6957569575
imagePullPolicy: Always
6957669576
livenessProbe:
6957769577
failureThreshold: 3

‎deploy/cw-operator.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ spec:
5858
value: 10s
5959
- name: PGO_FEATURE_GATES
6060
value: ""
61-
image: docker.io/perconalab/percona-postgresql-operator:main
61+
image: docker.io/percona/percona-postgresql-operator:2.9.0
6262
imagePullPolicy: Always
6363
livenessProbe:
6464
failureThreshold: 3

‎deploy/operator.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ spec:
6161
value: 10s
6262
- name: PGO_FEATURE_GATES
6363
value: ""
64-
image: docker.io/perconalab/percona-postgresql-operator:main
64+
image: docker.io/percona/percona-postgresql-operator:2.9.0
6565
imagePullPolicy: Always
6666
livenessProbe:
6767
failureThreshold: 3

0 commit comments

Comments
 (0)