Skip to content

Commit aee504f

Browse files
horshors
authored
Merge branch 'main' into hors-patch-1
2 parents c1b036e + 75f59f6 commit aee504f

24 files changed

Lines changed: 93 additions & 97 deletions

‎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/crd/patches/versionlabel_in_perconapgbackups.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ kind: CustomResourceDefinition
33
metadata:
44
name: perconapgbackups.pgv2.percona.com
55
labels:
6-
pgv2.percona.com/version: v2.9.0
6+
pgv2.percona.com/version: v2.10.0

‎config/crd/patches/versionlabel_in_perconapgclusters.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ kind: CustomResourceDefinition
33
metadata:
44
name: perconapgclusters.pgv2.percona.com
55
labels:
6-
pgv2.percona.com/version: v2.9.0
6+
pgv2.percona.com/version: v2.10.0

‎config/crd/patches/versionlabel_in_perconapgrestores.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ kind: CustomResourceDefinition
33
metadata:
44
name: perconapgrestores.pgv2.percona.com
55
labels:
6-
pgv2.percona.com/version: v2.9.0
6+
pgv2.percona.com/version: v2.10.0

‎config/crd/patches/versionlabel_in_perconapgupgrade.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ kind: CustomResourceDefinition
33
metadata:
44
name: perconapgupgrades.pgv2.percona.com
55
labels:
6-
pgv2.percona.com/version: v2.9.0
6+
pgv2.percona.com/version: v2.10.0

‎deploy/bundle.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ metadata:
297297
annotations:
298298
controller-gen.kubebuilder.io/version: v0.20.0
299299
labels:
300-
pgv2.percona.com/version: v2.9.0
300+
pgv2.percona.com/version: v2.10.0
301301
name: perconapgbackups.pgv2.percona.com
302302
spec:
303303
group: pgv2.percona.com
@@ -995,7 +995,7 @@ metadata:
995995
annotations:
996996
controller-gen.kubebuilder.io/version: v0.20.0
997997
labels:
998-
pgv2.percona.com/version: v2.9.0
998+
pgv2.percona.com/version: v2.10.0
999999
name: perconapgclusters.pgv2.percona.com
10001000
spec:
10011001
group: pgv2.percona.com
@@ -30140,7 +30140,7 @@ metadata:
3014030140
annotations:
3014130141
controller-gen.kubebuilder.io/version: v0.20.0
3014230142
labels:
30143-
pgv2.percona.com/version: v2.9.0
30143+
pgv2.percona.com/version: v2.10.0
3014430144
name: perconapgrestores.pgv2.percona.com
3014530145
spec:
3014630146
group: pgv2.percona.com
@@ -30462,7 +30462,7 @@ metadata:
3046230462
annotations:
3046330463
controller-gen.kubebuilder.io/version: v0.20.0
3046430464
labels:
30465-
pgv2.percona.com/version: v2.9.0
30465+
pgv2.percona.com/version: v2.10.0
3046630466
name: perconapgupgrades.pgv2.percona.com
3046730467
spec:
3046830468
group: pgv2.percona.com

‎deploy/cr.yaml‎

Lines changed: 5 additions & 5 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.9.0
12+
crVersion: 2.10.0
1313
# clusterServiceDNSSuffix: cluster.local
1414
# initContainer:
1515
# image: docker.io/perconalab/percona-postgresql-operator:main
@@ -183,9 +183,9 @@ spec:
183183
# test-label: value
184184

185185

186-
image: docker.io/perconalab/percona-postgresql-operator:main-ppg17-postgres
186+
image: docker.io/perconalab/percona-postgresql-operator:main-ppg18-postgres
187187
imagePullPolicy: Always
188-
postgresVersion: 17
188+
postgresVersion: 18
189189
# port: 5432
190190

191191
# expose:
@@ -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/perconalab/percona-postgresql-operator:main-pgbouncer18
370370
# env:
371371
# - name: MY_ENV
372372
# value: "1000"
@@ -492,7 +492,7 @@ spec:
492492
pgbackrest:
493493
# metadata:
494494
# labels:
495-
image: docker.io/perconalab/percona-postgresql-operator:main-pgbackrest17
495+
image: docker.io/perconalab/percona-postgresql-operator:main-pgbackrest18
496496
# env:
497497
# - name: MY_ENV
498498
# value: "1000"

‎deploy/crd.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ metadata:
297297
annotations:
298298
controller-gen.kubebuilder.io/version: v0.20.0
299299
labels:
300-
pgv2.percona.com/version: v2.9.0
300+
pgv2.percona.com/version: v2.10.0
301301
name: perconapgbackups.pgv2.percona.com
302302
spec:
303303
group: pgv2.percona.com
@@ -995,7 +995,7 @@ metadata:
995995
annotations:
996996
controller-gen.kubebuilder.io/version: v0.20.0
997997
labels:
998-
pgv2.percona.com/version: v2.9.0
998+
pgv2.percona.com/version: v2.10.0
999999
name: perconapgclusters.pgv2.percona.com
10001000
spec:
10011001
group: pgv2.percona.com
@@ -30140,7 +30140,7 @@ metadata:
3014030140
annotations:
3014130141
controller-gen.kubebuilder.io/version: v0.20.0
3014230142
labels:
30143-
pgv2.percona.com/version: v2.9.0
30143+
pgv2.percona.com/version: v2.10.0
3014430144
name: perconapgrestores.pgv2.percona.com
3014530145
spec:
3014630146
group: pgv2.percona.com
@@ -30462,7 +30462,7 @@ metadata:
3046230462
annotations:
3046330463
controller-gen.kubebuilder.io/version: v0.20.0
3046430464
labels:
30465-
pgv2.percona.com/version: v2.9.0
30465+
pgv2.percona.com/version: v2.10.0
3046630466
name: perconapgupgrades.pgv2.percona.com
3046730467
spec:
3046830468
group: pgv2.percona.com

‎deploy/cw-bundle.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ metadata:
297297
annotations:
298298
controller-gen.kubebuilder.io/version: v0.20.0
299299
labels:
300-
pgv2.percona.com/version: v2.9.0
300+
pgv2.percona.com/version: v2.10.0
301301
name: perconapgbackups.pgv2.percona.com
302302
spec:
303303
group: pgv2.percona.com
@@ -995,7 +995,7 @@ metadata:
995995
annotations:
996996
controller-gen.kubebuilder.io/version: v0.20.0
997997
labels:
998-
pgv2.percona.com/version: v2.9.0
998+
pgv2.percona.com/version: v2.10.0
999999
name: perconapgclusters.pgv2.percona.com
10001000
spec:
10011001
group: pgv2.percona.com
@@ -30140,7 +30140,7 @@ metadata:
3014030140
annotations:
3014130141
controller-gen.kubebuilder.io/version: v0.20.0
3014230142
labels:
30143-
pgv2.percona.com/version: v2.9.0
30143+
pgv2.percona.com/version: v2.10.0
3014430144
name: perconapgrestores.pgv2.percona.com
3014530145
spec:
3014630146
group: pgv2.percona.com
@@ -30462,7 +30462,7 @@ metadata:
3046230462
annotations:
3046330463
controller-gen.kubebuilder.io/version: v0.20.0
3046430464
labels:
30465-
pgv2.percona.com/version: v2.9.0
30465+
pgv2.percona.com/version: v2.10.0
3046630466
name: perconapgupgrades.pgv2.percona.com
3046730467
spec:
3046830468
group: pgv2.percona.com

‎deploy/upgrade.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apiVersion: pgv2.percona.com/v2
22
kind: PerconaPGUpgrade
33
metadata:
4-
name: cluster1-16-to-17
4+
name: cluster1-17-to-18
55
spec:
66
postgresClusterName: cluster1
77
image: docker.io/perconalab/percona-postgresql-operator:main-upgrade
8-
fromPostgresVersion: 16
9-
toPostgresVersion: 17
10-
toPostgresImage: docker.io/perconalab/percona-postgresql-operator:main-ppg17-postgres
11-
toPgBouncerImage: docker.io/perconalab/percona-postgresql-operator:main-pgbouncer17
12-
toPgBackRestImage: docker.io/perconalab/percona-postgresql-operator:main-pgbackrest17
8+
fromPostgresVersion: 17
9+
toPostgresVersion: 18
10+
toPostgresImage: docker.io/perconalab/percona-postgresql-operator:main-ppg18-postgres
11+
toPgBouncerImage: docker.io/perconalab/percona-postgresql-operator:main-pgbouncer18
12+
toPgBackRestImage: docker.io/perconalab/percona-postgresql-operator:main-pgbackrest18

0 commit comments

Comments
 (0)