Skip to content

Commit 56185f4

Browse files
eleo007eleo007
authored
Release 2.7.0 op (#1219)
1 parent 49da79e commit 56185f4

File tree

16 files changed

+96
-52
lines changed

16 files changed

+96
-52
lines changed

‎Makefile‎

Lines changed: 42 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -369,12 +369,36 @@ release-postgres-operator-image-labels:
369369
##@ Percona
370370

371371
# Default values if not already set
372+
ifeq (undefined,$(origin REGISTRY_NAME))
373+
$(info REGISTRY_NAME is not set)
374+
else ifeq (undefined,$(origin IMAGE))
375+
$(info IMAGE is not set)
376+
else
377+
IMAGE := $(REGISTRY_NAME)/$(IMAGE)
378+
$(info Combined IMAGE: $(IMAGE))
379+
endif
380+
372381
NAME ?= percona-postgresql-operator
373382
VERSION ?= $(shell git rev-parse --abbrev-ref HEAD | sed -e 's^/^-^g; s^[.]^-^g;' | tr '[:upper:]' '[:lower:]')
374383
ROOT_REPO ?= ${PWD}
375384
IMAGE_TAG_BASE ?= perconalab/$(NAME)
376385
IMAGE ?= $(IMAGE_TAG_BASE):$(VERSION)
377386
PGO_VERSION ?= $(shell git describe --tags)
387+
REGISTRY_NAME ?= docker.io
388+
REGISTRY_NAME_FULL = $(REGISTRY_NAME)/
389+
390+
generate:
391+
ifneq (,$(filter percona/% perconalab/%,$(IMAGE)))
392+
ifeq (,$(findstring docker.io/,$(IMAGE)))
393+
IMAGE := $(REGISTRY_NAME_FULL)$(IMAGE)
394+
$(info Updated IMAGE to: $(IMAGE))
395+
else
396+
$(info IMAGE already qualified: $(IMAGE))
397+
endif
398+
else
399+
$(info Skipping: IMAGE does not match percona/perconalab)
400+
endif
401+
$(info $(IMAGE))
378402

379403
KUSTOMIZE = $(shell pwd)/bin/kustomize
380404
kustomize: ## Download kustomize locally if necessary.
@@ -425,17 +449,17 @@ include e2e-tests/release_versions
425449
release: generate
426450
$(SED) -i \
427451
-e "/^spec:/,/^ crVersion:/{s/crVersion: .*/crVersion: $(VERSION)/}" \
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)#}" \
431-
-e "/extensions:/,/image:/{s#image: .*#image: $(IMAGE_OPERATOR)#}" \
432-
-e "/^ pmm:/,/^ image:/{s#image: .*#image: $(IMAGE_PMM3_CLIENT)#}" deploy/cr.yaml
452+
-e "/^spec:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_POSTGRESQL17)#}" \
453+
-e "/^ pgBouncer:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_PGBOUNCER17)#}" \
454+
-e "/^ pgbackrest:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_BACKREST17)#}" \
455+
-e "/extensions:/,/image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_OPERATOR)#}" \
456+
-e "/^ pmm:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_PMM3_CLIENT)#}" deploy/cr.yaml
433457
$(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
434458
$(SED) -i \
435-
-e "/^spec:/,/^ image:/{s#image: .*#image: $(IMAGE_OPERATOR)#}" \
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
459+
-e "/^spec:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)$(IMAGE_UPGRADE)#}" \
460+
-e "/^spec:/,/^ toPostgresImage:/{s#toPostgresImage: .*#toPostgresImage: $(REGISTRY_NAME_FULL)$(IMAGE_POSTGRESQL17)#}" \
461+
-e "/^spec:/,/^ toPgBouncerImage:/{s#toPgBouncerImage: .*#toPgBouncerImage: $(REGISTRY_NAME_FULL)$(IMAGE_PGBOUNCER17)#}" \
462+
-e "/^spec:/,/^ toPgBackRestImage:/{s#toPgBackRestImage: .*#toPgBackRestImage: $(REGISTRY_NAME_FULL)$(IMAGE_BACKREST17)#}" deploy/upgrade.yaml
439463

440464
# Prepare main branch after release
441465
MAJOR_VER := $(shell grep -oE "crVersion: .*" deploy/cr.yaml|grep -oE "[0-9]+\.[0-9]+\.[0-9]+"|cut -d'.' -f1)
@@ -444,14 +468,14 @@ NEXT_VER ?= $(MAJOR_VER).$$(($(MINOR_VER) + 1)).0
444468
after-release: generate
445469
$(SED) -i \
446470
-e "/^spec:/,/^ crVersion:/{s/crVersion: .*/crVersion: $(NEXT_VER)/}" \
447-
-e "/^spec:/,/^ image:/{s#image: .*#image: perconalab/percona-postgresql-operator:main-ppg$(PG_VER)-postgres#}" \
448-
-e "/^ pgBouncer:/,/^ image:/{s#image: .*#image: perconalab/percona-postgresql-operator:main-ppg$(PG_VER)-pgbouncer#}" \
449-
-e "/^ pgbackrest:/,/^ image:/{s#image: .*#image: perconalab/percona-postgresql-operator:main-ppg$(PG_VER)-pgbackrest#}" \
450-
-e "/extensions:/,/image:/{s#image: .*#image: perconalab/percona-postgresql-operator:main#}" \
451-
-e "/^ pmm:/,/^ image:/{s#image: .*#image: perconalab/pmm-client:dev-latest#}" deploy/cr.yaml
471+
-e "/^spec:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-ppg$(PG_VER)-postgres#}" \
472+
-e "/^ pgBouncer:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-pgbouncer$(PG_VER)#}" \
473+
-e "/^ pgbackrest:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-pgbackrest$(PG_VER)#}" \
474+
-e "/extensions:/,/image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main#}" \
475+
-e "/^ pmm:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)perconalab/pmm-client:dev-latest#}" deploy/cr.yaml
452476
$(SED) -i -r "/Version *= \"[0-9]+\.[0-9]+\.[0-9]+\"$$/ s/[0-9]+\.[0-9]+\.[0-9]+/$(NEXT_VER)/" pkg/apis/pgv2.percona.com/v2/perconapgcluster_types.go
453477
$(SED) -i \
454-
-e "/^spec:/,/^ image:/{s#image: .*#image: perconalab/percona-postgresql-operator:main#}" \
455-
-e "/^spec:/,/^ toPostgresImage:/{s#toPostgresImage: .*#toPostgresImage: perconalab/percona-postgresql-operator:main-ppg$(PG_VER)-postgres#}" \
456-
-e "/^spec:/,/^ toPgBouncerImage:/{s#toPgBouncerImage: .*#toPgBouncerImage: perconalab/percona-postgresql-operator:main-ppg$(PG_VER)-pgbouncer#}" \
457-
-e "/^spec:/,/^ toPgBackRestImage:/{s#toPgBackRestImage: .*#toPgBackRestImage: perconalab/percona-postgresql-operator:main-ppg$(PG_VER)-pgbackrest#}" deploy/upgrade.yaml
478+
-e "/^spec:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-upgrade#}" \
479+
-e "/^spec:/,/^ toPostgresImage:/{s#toPostgresImage: .*#toPostgresImage: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-ppg$(PG_VER)-postgres#}" \
480+
-e "/^spec:/,/^ toPgBouncerImage:/{s#toPgBouncerImage: .*#toPgBouncerImage: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-pgbouncer$(PG_VER)#}" \
481+
-e "/^spec:/,/^ toPgBackRestImage:/{s#toPgBackRestImage: .*#toPgBackRestImage: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-pgbackrest$(PG_VER)#}" deploy/upgrade.yaml

‎config/bundle/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ resources:
66
- ../manager/namespace
77
images:
88
- name: postgres-operator
9-
newName: percona/percona-postgresql-operator
9+
newName: docker.io/percona/percona-postgresql-operator
1010
newTag: 2.7.0

‎config/cw-bundle/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ resources:
77

88
images:
99
- name: postgres-operator
10-
newName: percona/percona-postgresql-operator
10+
newName: docker.io/percona/percona-postgresql-operator
1111
newTag: 2.7.0

‎config/manager/cluster/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ patchesStrategicMerge:
88

99
images:
1010
- name: postgres-operator
11-
newName: percona/percona-postgresql-operator
11+
newName: docker.io/percona/percona-postgresql-operator
1212
newTag: 2.7.0

‎config/manager/namespace/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ patchesStrategicMerge:
99

1010
images:
1111
- name: postgres-operator
12-
newName: percona/percona-postgresql-operator
12+
newName: docker.io/percona/percona-postgresql-operator
1313
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: percona/percona-postgresql-operator:2.7.0
47584+
image: docker.io/percona/percona-postgresql-operator:2.7.0
4758547585
imagePullPolicy: Always
4758647586
livenessProbe:
4758747587
failureThreshold: 3

‎deploy/cr.yaml‎

Lines changed: 8 additions & 8 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: percona/percona-postgresql-operator:2.7.0-ppg17.5.2-postgres
14+
# image: docker.io/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: percona/percona-postgresql-operator:2.7.0-ppg17.5.2-postgres
157+
image: docker.io/percona/percona-postgresql-operator:2.7.0-ppg17.5.2-postgres
158158
imagePullPolicy: Always
159159
postgresVersion: 17
160160
# port: 5432
@@ -180,7 +180,7 @@ spec:
180180
- name: instance1
181181
replicas: 3
182182
# initContainer:
183-
# image: perconalab/percona-postgresql-operator:main
183+
# image: docker.io/percona/percona-postgresql-operator:2.7.0
184184
# resources:
185185
# limits:
186186
# cpu: 2.0
@@ -304,7 +304,7 @@ spec:
304304
proxy:
305305
pgBouncer:
306306
replicas: 3
307-
image: percona/percona-pgbouncer:1.24.1
307+
image: docker.io/percona/percona-pgbouncer:1.24.1
308308
# exposeSuperusers: true
309309
# resources:
310310
# limits:
@@ -394,9 +394,9 @@ spec:
394394
pgbackrest:
395395
# metadata:
396396
# labels:
397-
image: percona/percona-pgbackrest:2.55.0
397+
image: docker.io/percona/percona-pgbackrest:2.55.0
398398
# initContainer:
399-
# image: perconalab/percona-postgresql-operator:main
399+
# image: docker.io/percona/percona-postgresql-operator:2.7.0
400400
# resources:
401401
# limits:
402402
# cpu: 2.0
@@ -585,7 +585,7 @@ spec:
585585

586586
pmm:
587587
enabled: false
588-
image: percona/pmm-client:3.2.0
588+
image: docker.io/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: percona/percona-postgresql-operator:2.7.0
622+
# image: docker.io/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: percona/percona-postgresql-operator:2.7.0
47582+
image: docker.io/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: percona/percona-postgresql-operator:2.7.0
47+
image: docker.io/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: percona/percona-postgresql-operator:2.7.0
50+
image: docker.io/percona/percona-postgresql-operator:2.7.0
5151
imagePullPolicy: Always
5252
livenessProbe:
5353
failureThreshold: 3

0 commit comments

Comments
 (0)