Skip to content

Commit 1933db4

Browse files
nmarukovichnmarukovich
committed
Merge branch 'K8SPG-768_skip_log_creation' of github.com:percona/percona-postgresql-operator into K8SPG-768_skip_log_creation
2 parents dd0f181 + e65a016 commit 1933db4

File tree

62 files changed

+1031
-194
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1031
-194
lines changed

‎Makefile‎

Lines changed: 52 additions & 21 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,33 +449,40 @@ 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_POSTGRESQL16)#}" \
429-
-e "/^ pgBouncer:/,/^ image:/{s#image: .*#image: $(IMAGE_PGBOUNCER16)#}" \
430-
-e "/^ pgbackrest:/,/^ image:/{s#image: .*#image: $(IMAGE_PGBACKREST16)#}" \
431-
-e "/extensions:/,/image:/{s#image: .*#image: $(IMAGE_OPERATOR)#}" \
432-
-e "/^ pmm:/,/^ image:/{s#image: .*#image: $(IMAGE_PMM_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_POSTGRESQL16)#}" \
437-
-e "/^spec:/,/^ toPgBouncerImage:/{s#toPgBouncerImage: .*#toPgBouncerImage: $(IMAGE_PGBOUNCER16)#}" \
438-
-e "/^spec:/,/^ toPgBackRestImage:/{s#toPgBackRestImage: .*#toPgBackRestImage: $(IMAGE_PGBACKREST16)#}" 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
441-
MAJOR_VER := $(shell grep -oE "crVersion: .*" deploy/cr.yaml|grep -oE "[0-9]+\.[0-9]+\.[0-9]+"|cut -d'.' -f1)
442-
MINOR_VER := $(shell grep -oE "crVersion: .*" deploy/cr.yaml|grep -oE "[0-9]+\.[0-9]+\.[0-9]+"|cut -d'.' -f2)
443-
NEXT_VER ?= $(MAJOR_VER).$$(($(MINOR_VER) + 1)).0
465+
CURRENT_VERSION := $(shell grep -oE "crVersion: [0-9]+\.[0-9]+\.[0-9]+" deploy/cr.yaml | grep -oE "[0-9]+\.[0-9]+\.[0-9]+")
466+
MAJOR_VER := $(word 1,$(subst ., ,$(CURRENT_VERSION)))
467+
MINOR_VER := $(word 2,$(subst ., ,$(CURRENT_VERSION)))
468+
NEXT_VER := $(MAJOR_VER).$(shell expr $(MINOR_VER) + 1).0
469+
PREV1_VERSION := $(MAJOR_VER).$(shell expr $(MINOR_VER) - 1).0
470+
PREV2_VERSION := $(MAJOR_VER).$(shell expr $(MINOR_VER) - 2).0
444471
after-release: generate
472+
echo $(NEXT_VER) > percona/version/version.txt
445473
$(SED) -i \
446474
-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
475+
-e "/^spec:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-ppg$(PG_VER)-postgres#}" \
476+
-e "/^ pgBouncer:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-pgbouncer$(PG_VER)#}" \
477+
-e "/^ pgbackrest:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-pgbackrest$(PG_VER)#}" \
478+
-e "/extensions:/,/image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main#}" \
479+
-e "/^ pmm:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)perconalab/pmm-client:dev-latest#}" deploy/cr.yaml percona/controller/testdata/sidecar-resources-cr.yaml
452480
$(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
453481
$(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
482+
-e "/^spec:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-upgrade#}" \
483+
-e "/^spec:/,/^ toPostgresImage:/{s#toPostgresImage: .*#toPostgresImage: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-ppg$(PG_VER)-postgres#}" \
484+
-e "/^spec:/,/^ toPgBouncerImage:/{s#toPgBouncerImage: .*#toPgBouncerImage: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-pgbouncer$(PG_VER)#}" \
485+
-e "/^spec:/,/^ toPgBackRestImage:/{s#toPgBackRestImage: .*#toPgBackRestImage: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-pgbackrest$(PG_VER)#}" deploy/upgrade.yaml
486+
$(SED) -i "s/$(PREV2_VERSION)/$(PREV1_VERSION)/g" e2e-tests/tests/upgrade-consistency/01-*.yaml
487+
$(SED) -i "s/$(PREV1_VERSION)/$(CURRENT_VERSION)/g" e2e-tests/tests/upgrade-consistency/02-*.yaml
488+
$(SED) -i "s/$(CURRENT_VERSION)/$(NEXT_VER)/g" e2e-tests/tests/upgrade-consistency/03-*.yaml e2e-tests/tests/init-deploy/05-assert.yaml

‎build/crd/percona/generated/pgv2.percona.com_perconapgclusters.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5237,9 +5237,6 @@ spec:
52375237
Version of the operator. Update this to new version after operator
52385238
upgrade to apply changes to Kubernetes objects. Default is the latest
52395239
version.
5240-
Version is the application version in the format X.Y.Z (e.g., "2.7.0").
5241-
example: 2.7.0
5242-
pattern: ^$|^\d+\.\d+\.\d+$
52435240
type: string
52445241
dataSource:
52455242
description: Specifies a data source for bootstrapping the PostgreSQL

‎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: perconalab/percona-postgresql-operator
9+
newName: docker.io/perconalab/percona-postgresql-operator
1010
newTag: main

‎config/crd/bases/pgv2.percona.com_perconapgclusters.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5644,9 +5644,6 @@ spec:
56445644
Version of the operator. Update this to new version after operator
56455645
upgrade to apply changes to Kubernetes objects. Default is the latest
56465646
version.
5647-
Version is the application version in the format X.Y.Z (e.g., "2.7.0").
5648-
example: 2.7.0
5649-
pattern: ^$|^\d+\.\d+\.\d+$
56505647
type: string
56515648
dataSource:
56525649
description: Specifies a data source for bootstrapping the PostgreSQL

‎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.7.0
6+
pgv2.percona.com/version: v2.8.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.7.0
6+
pgv2.percona.com/version: v2.8.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.7.0
6+
pgv2.percona.com/version: v2.8.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.7.0
6+
pgv2.percona.com/version: v2.8.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: perconalab/percona-postgresql-operator
10+
newName: docker.io/perconalab/percona-postgresql-operator
1111
newTag: main

‎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: perconalab/percona-postgresql-operator
11+
newName: docker.io/perconalab/percona-postgresql-operator
1212
newTag: main

0 commit comments

Comments
 (0)