diff --git a/.github/workflows/reviewdog.yml b/.github/workflows/reviewdog.yml index bd27cd0bd9..8bf1e2be9d 100644 --- a/.github/workflows/reviewdog.yml +++ b/.github/workflows/reviewdog.yml @@ -94,12 +94,12 @@ jobs: steps: - uses: actions/checkout@v6 - name: check on release branch - if: ${{ contains(github.base_ref, 'release-') }} + if: ${{ contains(github.base_ref, 'release-') && ! startsWith(github.head_ref, 'after-release-') }} run: | make generate VERSION="$(cat percona/version/version.txt)" IMAGE_TAG_BASE="percona/percona-postgresql-operator" git diff --exit-code - name: check on non release branches - if: ${{ ! contains(github.base_ref, 'release-') }} + if: ${{ ! contains(github.base_ref, 'release-') || startsWith(github.head_ref, 'after-release-') }} run: | make generate VERSION=main git diff --exit-code diff --git a/Makefile b/Makefile index 6c72a57b41..9311b207fd 100644 --- a/Makefile +++ b/Makefile @@ -440,6 +440,9 @@ release: generate -e "/^spec:/,/^ toPgBouncerImage:/{s#toPgBouncerImage: .*#toPgBouncerImage: $(REGISTRY_NAME_FULL)$(IMAGE_PGBOUNCER18)#}" \ -e "/^spec:/,/^ toPgBackRestImage:/{s#toPgBackRestImage: .*#toPgBackRestImage: $(REGISTRY_NAME_FULL)$(IMAGE_BACKREST18)#}" deploy/upgrade.yaml +# Update sidecars + $(SED) -i -r "s#pgv2.percona.com/version: [0-9]+\.[0-9]+\.[0-9]+#pgv2.percona.com/version: $(VERSION)#" e2e-tests/tests/sidecars/01-assert.yaml + # Prepare main branch after release CURRENT_VERSION := $(shell grep -oE "crVersion: [0-9]+\.[0-9]+\.[0-9]+" deploy/cr.yaml | grep -oE "[0-9]+\.[0-9]+\.[0-9]+") MAJOR_VER := $(word 1,$(subst ., ,$(CURRENT_VERSION))) @@ -447,7 +450,9 @@ MINOR_VER := $(word 2,$(subst ., ,$(CURRENT_VERSION))) NEXT_VER := $(MAJOR_VER).$(shell expr $(MINOR_VER) + 1).0 PREV1_VERSION := $(MAJOR_VER).$(shell expr $(MINOR_VER) - 1).0 PREV2_VERSION := $(MAJOR_VER).$(shell expr $(MINOR_VER) - 2).0 -after-release: update-version generate + +.PHONY: after-release after-release-versions +after-release: update-version generate after-release-versions $(SED) -i \ -e "/^spec:/,/^ crVersion:/{s/crVersion: .*/crVersion: $(NEXT_VER)/}" \ -e "/^spec:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-ppg$(PG_VER)-postgres#}" \ @@ -455,7 +460,7 @@ after-release: update-version generate -e "/^ pgBouncer:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-pgbouncer$(PG_VER)#}" \ -e "/^ pgbackrest:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-pgbackrest$(PG_VER)#}" \ -e "/extensions:/,/image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main#}" \ - -e "/^ pmm:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)perconalab/pmm-client:dev-latest#}" deploy/cr.yaml percona/controller/testdata/sidecar-resources-cr.yaml + -e "/^ pmm:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)perconalab/pmm-client:3-dev-latest#}" deploy/cr.yaml percona/controller/testdata/sidecar-resources-cr.yaml $(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 $(SED) -i \ -e "/^spec:/,/^ image:/{s#image: .*#image: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-upgrade#}" \ @@ -463,7 +468,40 @@ after-release: update-version generate -e "/^spec:/,/^ toPgBouncerImage:/{s#toPgBouncerImage: .*#toPgBouncerImage: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-pgbouncer$(PG_VER)#}" \ -e "/^spec:/,/^ toPgBackRestImage:/{s#toPgBackRestImage: .*#toPgBackRestImage: $(REGISTRY_NAME_FULL)perconalab/percona-postgresql-operator:main-pgbackrest$(PG_VER)#}" deploy/upgrade.yaml +# Update sidecars + $(SED) -i -r "s#pgv2.percona.com/version: [0-9]+\.[0-9]+\.[0-9]+#pgv2.percona.com/version: $(NEXT_VER)#" e2e-tests/tests/sidecars/01-assert.yaml + # Update upgrade-consistency $(SED) -i "s/$(PREV2_VERSION)/$(PREV1_VERSION)/g" e2e-tests/tests/upgrade-consistency/01-*.yaml $(SED) -i "s/$(PREV1_VERSION)/$(CURRENT_VERSION)/g" e2e-tests/tests/upgrade-consistency/02-*.yaml $(SED) -i "s/$(CURRENT_VERSION)/$(NEXT_VER)/g" e2e-tests/tests/upgrade-consistency/03-*.yaml e2e-tests/tests/init-deploy/05-assert.yaml + +after-release-versions: + $(SED) -i \ + -e "s#^IMAGE_OPERATOR=.*#IMAGE_OPERATOR=$(IMAGE_TAG_BASE):main#" \ + -e "s#^IMAGE_POSTGRESQL14=.*#IMAGE_POSTGRESQL14=$(IMAGE_TAG_BASE):main-ppg14-postgres#" \ + -e "s#^IMAGE_PGBOUNCER14=.*#IMAGE_PGBOUNCER14=$(IMAGE_TAG_BASE):main-pgbouncer14#" \ + -e "s#^IMAGE_POSTGIS14=.*#IMAGE_POSTGIS14=$(IMAGE_TAG_BASE):main-ppg14-postgres-gis#" \ + -e "s#^IMAGE_BACKREST14=.*#IMAGE_BACKREST14=$(IMAGE_TAG_BASE):main-pgbackrest14#" \ + -e "s#^IMAGE_POSTGRESQL15=.*#IMAGE_POSTGRESQL15=$(IMAGE_TAG_BASE):main-ppg15-postgres#" \ + -e "s#^IMAGE_PGBOUNCER15=.*#IMAGE_PGBOUNCER15=$(IMAGE_TAG_BASE):main-pgbouncer15#" \ + -e "s#^IMAGE_POSTGIS15=.*#IMAGE_POSTGIS15=$(IMAGE_TAG_BASE):main-ppg15-postgres-gis#" \ + -e "s#^IMAGE_BACKREST15=.*#IMAGE_BACKREST15=$(IMAGE_TAG_BASE):main-pgbackrest15#" \ + -e "s#^IMAGE_POSTGRESQL16=.*#IMAGE_POSTGRESQL16=$(IMAGE_TAG_BASE):main-ppg16-postgres#" \ + -e "s#^IMAGE_PGBOUNCER16=.*#IMAGE_PGBOUNCER16=$(IMAGE_TAG_BASE):main-pgbouncer16#" \ + -e "s#^IMAGE_POSTGIS16=.*#IMAGE_POSTGIS16=$(IMAGE_TAG_BASE):main-ppg16-postgres-gis#" \ + -e "s#^IMAGE_BACKREST16=.*#IMAGE_BACKREST16=$(IMAGE_TAG_BASE):main-pgbackrest16#" \ + -e "s#^IMAGE_POSTGRESQL17=.*#IMAGE_POSTGRESQL17=$(IMAGE_TAG_BASE):main-ppg17-postgres#" \ + -e "s#^IMAGE_PGBOUNCER17=.*#IMAGE_PGBOUNCER17=$(IMAGE_TAG_BASE):main-pgbouncer17#" \ + -e "s#^IMAGE_POSTGIS17=.*#IMAGE_POSTGIS17=$(IMAGE_TAG_BASE):main-ppg17-postgres-gis#" \ + -e "s#^IMAGE_BACKREST17=.*#IMAGE_BACKREST17=$(IMAGE_TAG_BASE):main-pgbackrest17#" \ + -e "s#^IMAGE_POSTGRESQL18=.*#IMAGE_POSTGRESQL18=$(IMAGE_TAG_BASE):main-ppg18-postgres#" \ + -e "s#^IMAGE_PGBOUNCER18=.*#IMAGE_PGBOUNCER18=$(IMAGE_TAG_BASE):main-pgbouncer18#" \ + -e "s#^IMAGE_POSTGIS18=.*#IMAGE_POSTGIS18=$(IMAGE_TAG_BASE):main-ppg18-postgres-gis#" \ + -e "s#^IMAGE_BACKREST18=.*#IMAGE_BACKREST18=$(IMAGE_TAG_BASE):main-pgbackrest18#" \ + -e "s#^IMAGE_UPGRADE=.*#IMAGE_UPGRADE=$(IMAGE_TAG_BASE):main-upgrade#" \ + -e "s#^IMAGE_PMM_CLIENT=.*#IMAGE_PMM_CLIENT=perconalab/pmm-client:dev-latest#" \ + -e "s#^IMAGE_PMM_SERVER=.*#IMAGE_PMM_SERVER=perconalab/pmm-server:dev-latest#" \ + -e "s#^IMAGE_PMM3_CLIENT=.*#IMAGE_PMM3_CLIENT=perconalab/pmm-client:3-dev-latest#" \ + -e "s#^IMAGE_PMM3_SERVER=.*#IMAGE_PMM3_SERVER=perconalab/pmm-server:3-dev-latest#" \ + e2e-tests/release_versions diff --git a/config/bundle/kustomization.yaml b/config/bundle/kustomization.yaml index da038f604b..90cf89956e 100644 --- a/config/bundle/kustomization.yaml +++ b/config/bundle/kustomization.yaml @@ -6,5 +6,5 @@ resources: - ../manager/namespace images: - name: postgres-operator - newName: docker.io/percona/percona-postgresql-operator - newTag: 3.0.0 + newName: docker.io/perconalab/percona-postgresql-operator + newTag: main diff --git a/config/crd/patches/versionlabel_in_perconapgbackups.yaml b/config/crd/patches/versionlabel_in_perconapgbackups.yaml index b7753c5cf9..011f646c10 100644 --- a/config/crd/patches/versionlabel_in_perconapgbackups.yaml +++ b/config/crd/patches/versionlabel_in_perconapgbackups.yaml @@ -3,4 +3,4 @@ kind: CustomResourceDefinition metadata: name: perconapgbackups.pgv2.percona.com labels: - pgv2.percona.com/version: v3.0.0 + pgv2.percona.com/version: v3.1.0 diff --git a/config/crd/patches/versionlabel_in_perconapgclusters.yaml b/config/crd/patches/versionlabel_in_perconapgclusters.yaml index 59cba3258c..d7b16fc81f 100644 --- a/config/crd/patches/versionlabel_in_perconapgclusters.yaml +++ b/config/crd/patches/versionlabel_in_perconapgclusters.yaml @@ -3,4 +3,4 @@ kind: CustomResourceDefinition metadata: name: perconapgclusters.pgv2.percona.com labels: - pgv2.percona.com/version: v3.0.0 + pgv2.percona.com/version: v3.1.0 diff --git a/config/crd/patches/versionlabel_in_perconapgrestores.yaml b/config/crd/patches/versionlabel_in_perconapgrestores.yaml index ebc6fa92a4..8517135fca 100644 --- a/config/crd/patches/versionlabel_in_perconapgrestores.yaml +++ b/config/crd/patches/versionlabel_in_perconapgrestores.yaml @@ -3,4 +3,4 @@ kind: CustomResourceDefinition metadata: name: perconapgrestores.pgv2.percona.com labels: - pgv2.percona.com/version: v3.0.0 + pgv2.percona.com/version: v3.1.0 diff --git a/config/crd/patches/versionlabel_in_perconapgupgrade.yaml b/config/crd/patches/versionlabel_in_perconapgupgrade.yaml index 1bd7c878d9..9c86cfbd17 100644 --- a/config/crd/patches/versionlabel_in_perconapgupgrade.yaml +++ b/config/crd/patches/versionlabel_in_perconapgupgrade.yaml @@ -3,4 +3,4 @@ kind: CustomResourceDefinition metadata: name: perconapgupgrades.pgv2.percona.com labels: - pgv2.percona.com/version: v3.0.0 + pgv2.percona.com/version: v3.1.0 diff --git a/config/cw-bundle/kustomization.yaml b/config/cw-bundle/kustomization.yaml index 4b6f9c27cd..440d098731 100644 --- a/config/cw-bundle/kustomization.yaml +++ b/config/cw-bundle/kustomization.yaml @@ -7,5 +7,5 @@ resources: images: - name: postgres-operator - newName: docker.io/percona/percona-postgresql-operator - newTag: 3.0.0 + newName: docker.io/perconalab/percona-postgresql-operator + newTag: main diff --git a/config/manager/cluster/kustomization.yaml b/config/manager/cluster/kustomization.yaml index 04f6d08745..6f8f4bf129 100644 --- a/config/manager/cluster/kustomization.yaml +++ b/config/manager/cluster/kustomization.yaml @@ -8,5 +8,5 @@ patchesStrategicMerge: images: - name: postgres-operator - newName: docker.io/percona/percona-postgresql-operator - newTag: 3.0.0 + newName: docker.io/perconalab/percona-postgresql-operator + newTag: main diff --git a/config/manager/namespace/kustomization.yaml b/config/manager/namespace/kustomization.yaml index 225e045faf..a57ff786e0 100644 --- a/config/manager/namespace/kustomization.yaml +++ b/config/manager/namespace/kustomization.yaml @@ -9,5 +9,5 @@ patchesStrategicMerge: images: - name: postgres-operator - newName: docker.io/percona/percona-postgresql-operator - newTag: 3.0.0 + newName: docker.io/perconalab/percona-postgresql-operator + newTag: main diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml index c049ca868c..aa9ffe3099 100644 --- a/deploy/bundle.yaml +++ b/deploy/bundle.yaml @@ -297,7 +297,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv2.percona.com/version: v3.0.0 + pgv2.percona.com/version: v3.1.0 name: perconapgbackups.pgv2.percona.com spec: group: pgv2.percona.com @@ -995,7 +995,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv2.percona.com/version: v3.0.0 + pgv2.percona.com/version: v3.1.0 name: perconapgclusters.pgv2.percona.com spec: group: pgv2.percona.com @@ -30129,7 +30129,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv2.percona.com/version: v3.0.0 + pgv2.percona.com/version: v3.1.0 name: perconapgrestores.pgv2.percona.com spec: group: pgv2.percona.com @@ -30451,7 +30451,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv2.percona.com/version: v3.0.0 + pgv2.percona.com/version: v3.1.0 name: perconapgupgrades.pgv2.percona.com spec: group: pgv2.percona.com @@ -69560,7 +69560,7 @@ spec: value: 10s - name: PGO_FEATURE_GATES value: "" - image: docker.io/percona/percona-postgresql-operator:3.0.0 + image: docker.io/perconalab/percona-postgresql-operator:main imagePullPolicy: Always livenessProbe: failureThreshold: 3 diff --git a/deploy/cr.yaml b/deploy/cr.yaml index 8bd5041438..d814b480fd 100644 --- a/deploy/cr.yaml +++ b/deploy/cr.yaml @@ -9,10 +9,10 @@ metadata: # - percona.com/delete-ssl # - percona.com/delete-backups spec: - crVersion: 3.0.0 + crVersion: 3.1.0 # clusterServiceDNSSuffix: cluster.local # initContainer: -# image: docker.io/percona/percona-postgresql-operator:3.0.0 +# image: docker.io/perconalab/percona-postgresql-operator:main # resources: # limits: # cpu: 2.0 @@ -183,7 +183,7 @@ spec: # test-label: value - image: docker.io/percona/percona-distribution-postgresql:18.3-2 + image: docker.io/perconalab/percona-postgresql-operator:main-ppg18-postgres imagePullPolicy: Always postgresVersion: 18 # port: 5432 @@ -217,7 +217,7 @@ spec: # - secretRef: # name: instance-env-secret # initContainer: -# image: docker.io/percona/percona-postgresql-operator:3.0.0 +# image: docker.io/perconalab/percona-postgresql-operator:main # resources: # limits: # cpu: 2.0 @@ -366,7 +366,7 @@ spec: proxy: pgBouncer: replicas: 3 - image: docker.io/percona/percona-pgbouncer:1.25.1-1 + image: docker.io/perconalab/percona-postgresql-operator:main-pgbouncer18 # env: # - name: MY_ENV # value: "1000" @@ -492,7 +492,7 @@ spec: pgbackrest: # metadata: # labels: - image: docker.io/percona/percona-pgbackrest:2.58.0-1 + image: docker.io/perconalab/percona-postgresql-operator:main-pgbackrest18 # env: # - name: MY_ENV # value: "1000" @@ -500,7 +500,7 @@ spec: # - secretRef: # name: repo-host-env-secret # initContainer: -# image: docker.io/percona/percona-postgresql-operator:3.0.0 +# image: docker.io/perconalab/percona-postgresql-operator:main # resources: # limits: # cpu: 2.0 @@ -721,7 +721,7 @@ spec: pmm: enabled: false - image: docker.io/percona/pmm-client:3.7.1 + image: docker.io/perconalab/pmm-client:3-dev-latest # imagePullPolicy: IfNotPresent secret: cluster1-pmm-secret serverHost: monitoring-service @@ -755,7 +755,7 @@ spec: # - basebackup # extensions: -# image: docker.io/percona/percona-postgresql-operator:3.0.0 +# image: docker.io/perconalab/percona-postgresql-operator:main # imagePullPolicy: Always # storage: # type: s3 diff --git a/deploy/crd.yaml b/deploy/crd.yaml index aa893d12d7..5053295806 100644 --- a/deploy/crd.yaml +++ b/deploy/crd.yaml @@ -297,7 +297,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv2.percona.com/version: v3.0.0 + pgv2.percona.com/version: v3.1.0 name: perconapgbackups.pgv2.percona.com spec: group: pgv2.percona.com @@ -995,7 +995,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv2.percona.com/version: v3.0.0 + pgv2.percona.com/version: v3.1.0 name: perconapgclusters.pgv2.percona.com spec: group: pgv2.percona.com @@ -30129,7 +30129,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv2.percona.com/version: v3.0.0 + pgv2.percona.com/version: v3.1.0 name: perconapgrestores.pgv2.percona.com spec: group: pgv2.percona.com @@ -30451,7 +30451,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv2.percona.com/version: v3.0.0 + pgv2.percona.com/version: v3.1.0 name: perconapgupgrades.pgv2.percona.com spec: group: pgv2.percona.com diff --git a/deploy/cw-bundle.yaml b/deploy/cw-bundle.yaml index 86e25075a1..0216f2ddab 100644 --- a/deploy/cw-bundle.yaml +++ b/deploy/cw-bundle.yaml @@ -297,7 +297,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv2.percona.com/version: v3.0.0 + pgv2.percona.com/version: v3.1.0 name: perconapgbackups.pgv2.percona.com spec: group: pgv2.percona.com @@ -995,7 +995,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv2.percona.com/version: v3.0.0 + pgv2.percona.com/version: v3.1.0 name: perconapgclusters.pgv2.percona.com spec: group: pgv2.percona.com @@ -30129,7 +30129,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv2.percona.com/version: v3.0.0 + pgv2.percona.com/version: v3.1.0 name: perconapgrestores.pgv2.percona.com spec: group: pgv2.percona.com @@ -30451,7 +30451,7 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.20.0 labels: - pgv2.percona.com/version: v3.0.0 + pgv2.percona.com/version: v3.1.0 name: perconapgupgrades.pgv2.percona.com spec: group: pgv2.percona.com @@ -69558,7 +69558,7 @@ spec: value: 10s - name: PGO_FEATURE_GATES value: "" - image: docker.io/percona/percona-postgresql-operator:3.0.0 + image: docker.io/perconalab/percona-postgresql-operator:main imagePullPolicy: Always livenessProbe: failureThreshold: 3 diff --git a/deploy/cw-operator.yaml b/deploy/cw-operator.yaml index bd07854653..48a7758660 100644 --- a/deploy/cw-operator.yaml +++ b/deploy/cw-operator.yaml @@ -58,7 +58,7 @@ spec: value: 10s - name: PGO_FEATURE_GATES value: "" - image: docker.io/percona/percona-postgresql-operator:3.0.0 + image: docker.io/perconalab/percona-postgresql-operator:main imagePullPolicy: Always livenessProbe: failureThreshold: 3 diff --git a/deploy/operator.yaml b/deploy/operator.yaml index ad1013272a..f7f95a0886 100644 --- a/deploy/operator.yaml +++ b/deploy/operator.yaml @@ -61,7 +61,7 @@ spec: value: 10s - name: PGO_FEATURE_GATES value: "" - image: docker.io/percona/percona-postgresql-operator:3.0.0 + image: docker.io/perconalab/percona-postgresql-operator:main imagePullPolicy: Always livenessProbe: failureThreshold: 3 diff --git a/deploy/upgrade.yaml b/deploy/upgrade.yaml index 27d8dcf4bc..4c3126e416 100644 --- a/deploy/upgrade.yaml +++ b/deploy/upgrade.yaml @@ -4,9 +4,9 @@ metadata: name: cluster1-17-to-18 spec: postgresClusterName: cluster1 - image: docker.io/percona/percona-postgresql-operator:3.0.0-upgrade + image: docker.io/perconalab/percona-postgresql-operator:main-upgrade fromPostgresVersion: 17 toPostgresVersion: 18 - toPostgresImage: docker.io/percona/percona-distribution-postgresql:18.3-2 - toPgBouncerImage: docker.io/percona/percona-pgbouncer:1.25.1-1 - toPgBackRestImage: docker.io/percona/percona-pgbackrest:2.58.0-1 + toPostgresImage: docker.io/perconalab/percona-postgresql-operator:main-ppg18-postgres + toPgBouncerImage: docker.io/perconalab/percona-postgresql-operator:main-pgbouncer18 + toPgBackRestImage: docker.io/perconalab/percona-postgresql-operator:main-pgbackrest18 diff --git a/e2e-tests/release_versions b/e2e-tests/release_versions index 960cb407a0..da3fe54ace 100644 --- a/e2e-tests/release_versions +++ b/e2e-tests/release_versions @@ -1,36 +1,36 @@ -IMAGE_OPERATOR=percona/percona-postgresql-operator:3.0.0 +IMAGE_OPERATOR=perconalab/percona-postgresql-operator:main -IMAGE_POSTGRESQL14=percona/percona-distribution-postgresql:14.23-1 -IMAGE_PGBOUNCER14=percona/percona-pgbouncer:1.25.2-1 -IMAGE_POSTGIS14=percona/percona-distribution-postgresql-with-postgis:14.23-2 -IMAGE_BACKREST14=percona/percona-pgbackrest:2.58.0-2 +IMAGE_POSTGRESQL14=perconalab/percona-postgresql-operator:main-ppg14-postgres +IMAGE_PGBOUNCER14=perconalab/percona-postgresql-operator:main-pgbouncer14 +IMAGE_POSTGIS14=perconalab/percona-postgresql-operator:main-ppg14-postgres-gis +IMAGE_BACKREST14=perconalab/percona-postgresql-operator:main-pgbackrest14 -IMAGE_POSTGRESQL15=percona/percona-distribution-postgresql:15.18-1 -IMAGE_PGBOUNCER15=percona/percona-pgbouncer:1.25.2-1 -IMAGE_POSTGIS15=percona/percona-distribution-postgresql-with-postgis:15.18-2 -IMAGE_BACKREST15=percona/percona-pgbackrest:2.58.0-2 +IMAGE_POSTGRESQL15=perconalab/percona-postgresql-operator:main-ppg15-postgres +IMAGE_PGBOUNCER15=perconalab/percona-postgresql-operator:main-pgbouncer15 +IMAGE_POSTGIS15=perconalab/percona-postgresql-operator:main-ppg15-postgres-gis +IMAGE_BACKREST15=perconalab/percona-postgresql-operator:main-pgbackrest15 -IMAGE_POSTGRESQL16=percona/percona-distribution-postgresql:16.14-1 -IMAGE_PGBOUNCER16=percona/percona-pgbouncer:1.25.2-1 -IMAGE_POSTGIS16=percona/percona-distribution-postgresql-with-postgis:16.14-2 -IMAGE_BACKREST16=percona/percona-pgbackrest:2.58.0-2 +IMAGE_POSTGRESQL16=perconalab/percona-postgresql-operator:main-ppg16-postgres +IMAGE_PGBOUNCER16=perconalab/percona-postgresql-operator:main-pgbouncer16 +IMAGE_POSTGIS16=perconalab/percona-postgresql-operator:main-ppg16-postgres-gis +IMAGE_BACKREST16=perconalab/percona-postgresql-operator:main-pgbackrest16 -IMAGE_POSTGRESQL17=percona/percona-distribution-postgresql:17.10-1 -IMAGE_PGBOUNCER17=percona/percona-pgbouncer:1.25.2-1 -IMAGE_POSTGIS17=percona/percona-distribution-postgresql-with-postgis:17.10-2 -IMAGE_BACKREST17=percona/percona-pgbackrest:2.58.0-2 +IMAGE_POSTGRESQL17=perconalab/percona-postgresql-operator:main-ppg17-postgres +IMAGE_PGBOUNCER17=perconalab/percona-postgresql-operator:main-pgbouncer17 +IMAGE_POSTGIS17=perconalab/percona-postgresql-operator:main-ppg17-postgres-gis +IMAGE_BACKREST17=perconalab/percona-postgresql-operator:main-pgbackrest17 -IMAGE_POSTGRESQL18=percona/percona-distribution-postgresql:18.4-1 -IMAGE_PGBOUNCER18=percona/percona-pgbouncer:1.25.2-1 -IMAGE_POSTGIS18=percona/percona-distribution-postgresql-with-postgis:18.4-2 -IMAGE_BACKREST18=percona/percona-pgbackrest:2.58.0-2 +IMAGE_POSTGRESQL18=perconalab/percona-postgresql-operator:main-ppg18-postgres +IMAGE_PGBOUNCER18=perconalab/percona-postgresql-operator:main-pgbouncer18 +IMAGE_POSTGIS18=perconalab/percona-postgresql-operator:main-ppg18-postgres-gis +IMAGE_BACKREST18=perconalab/percona-postgresql-operator:main-pgbackrest18 -IMAGE_UPGRADE=percona/percona-distribution-postgresql-upgrade:18.4-17.10-16.14-15.18-14.23-1 +IMAGE_UPGRADE=perconalab/percona-postgresql-operator:main-upgrade -IMAGE_PMM_CLIENT=percona/pmm-client:2.44.1-1 -IMAGE_PMM_SERVER=percona/pmm-server:2.44.1 -IMAGE_PMM3_CLIENT=percona/pmm-client:3.7.1 -IMAGE_PMM3_SERVER=percona/pmm-server:3.7.1 +IMAGE_PMM_CLIENT=perconalab/pmm-client:dev-latest +IMAGE_PMM_SERVER=perconalab/pmm-server:dev-latest +IMAGE_PMM3_CLIENT=perconalab/pmm-client:3-dev-latest +IMAGE_PMM3_SERVER=perconalab/pmm-server:3-dev-latest GKE_MIN=1.33 GKE_MAX=1.35 EKS_MIN=1.33 diff --git a/e2e-tests/tests/init-deploy/05-assert.yaml b/e2e-tests/tests/init-deploy/05-assert.yaml index b6e0fd5d4f..50e5d05c7e 100644 --- a/e2e-tests/tests/init-deploy/05-assert.yaml +++ b/e2e-tests/tests/init-deploy/05-assert.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/managed-by: percona-postgresql-operator app.kubernetes.io/name: percona-postgresql app.kubernetes.io/part-of: percona-postgresql - pgv2.percona.com/version: 3.0.0 + pgv2.percona.com/version: 3.1.0 postgres-operator.crunchydata.com/cluster: init-deploy postgres-operator.crunchydata.com/pgbackrest: "" postgres-operator.crunchydata.com/pgbackrest-config: "" @@ -81,7 +81,7 @@ metadata: app.kubernetes.io/managed-by: percona-postgresql-operator app.kubernetes.io/name: percona-postgresql app.kubernetes.io/part-of: percona-postgresql - pgv2.percona.com/version: 3.0.0 + pgv2.percona.com/version: 3.1.0 postgres-operator.crunchydata.com/cluster: init-deploy postgres-operator.crunchydata.com/role: pgbouncer test-label: test @@ -144,7 +144,7 @@ metadata: app.kubernetes.io/managed-by: percona-postgresql-operator app.kubernetes.io/name: percona-postgresql app.kubernetes.io/part-of: percona-postgresql - pgv2.percona.com/version: 3.0.0 + pgv2.percona.com/version: 3.1.0 postgres-operator.crunchydata.com/cluster: init-deploy postgres-operator.crunchydata.com/pgbackrest: "" postgres-operator.crunchydata.com/pgbackrest-config: "" @@ -168,7 +168,7 @@ metadata: app.kubernetes.io/managed-by: percona-postgresql-operator app.kubernetes.io/name: percona-postgresql app.kubernetes.io/part-of: percona-postgresql - pgv2.percona.com/version: 3.0.0 + pgv2.percona.com/version: 3.1.0 postgres-operator.crunchydata.com/cluster: init-deploy postgres-operator.crunchydata.com/role: pgbouncer test-label: test @@ -209,7 +209,7 @@ metadata: app.kubernetes.io/managed-by: percona-postgresql-operator app.kubernetes.io/name: percona-postgresql app.kubernetes.io/part-of: percona-postgresql - pgv2.percona.com/version: 3.0.0 + pgv2.percona.com/version: 3.1.0 postgres-operator.crunchydata.com/cluster: init-deploy postgres-operator.crunchydata.com/data: pgbackrest postgres-operator.crunchydata.com/pgbackrest: "" @@ -232,7 +232,7 @@ spec: app.kubernetes.io/managed-by: percona-postgresql-operator app.kubernetes.io/name: percona-postgresql app.kubernetes.io/part-of: percona-postgresql - pgv2.percona.com/version: 3.0.0 + pgv2.percona.com/version: 3.1.0 postgres-operator.crunchydata.com/cluster: init-deploy postgres-operator.crunchydata.com/data: pgbackrest postgres-operator.crunchydata.com/pgbackrest: "" diff --git a/e2e-tests/tests/sidecars/01-assert.yaml b/e2e-tests/tests/sidecars/01-assert.yaml index 82c7cb3a68..9467d0a230 100644 --- a/e2e-tests/tests/sidecars/01-assert.yaml +++ b/e2e-tests/tests/sidecars/01-assert.yaml @@ -222,7 +222,7 @@ metadata: app.kubernetes.io/managed-by: percona-postgresql-operator app.kubernetes.io/name: percona-postgresql app.kubernetes.io/part-of: percona-postgresql - pgv2.percona.com/version: 3.0.0 + pgv2.percona.com/version: 3.1.0 postgres-operator.crunchydata.com/cluster: sidecars postgres-operator.crunchydata.com/pgbackrest: "" name: sidecar-repohost-claim diff --git a/e2e-tests/tests/upgrade-consistency/03-assert.yaml b/e2e-tests/tests/upgrade-consistency/03-assert.yaml index 7d150791bc..e65f45a6ef 100644 --- a/e2e-tests/tests/upgrade-consistency/03-assert.yaml +++ b/e2e-tests/tests/upgrade-consistency/03-assert.yaml @@ -120,7 +120,7 @@ kind: PerconaPGCluster metadata: name: upgrade-consistency spec: - crVersion: 3.0.0 + crVersion: 3.1.0 status: pgbouncer: ready: 3 diff --git a/e2e-tests/tests/upgrade-consistency/03-patch-cluster.yaml b/e2e-tests/tests/upgrade-consistency/03-patch-cluster.yaml index a7c19da652..2f3171b367 100644 --- a/e2e-tests/tests/upgrade-consistency/03-patch-cluster.yaml +++ b/e2e-tests/tests/upgrade-consistency/03-patch-cluster.yaml @@ -8,7 +8,7 @@ commands: source ../../functions - cr_ver=3.0.0 + cr_ver=3.1.0 get_cr \ | yq eval ' diff --git a/e2e-tests/tests/upgrade-minor/01-assert.yaml b/e2e-tests/tests/upgrade-minor/01-assert.yaml index 19551ad384..763e98b46c 100644 --- a/e2e-tests/tests/upgrade-minor/01-assert.yaml +++ b/e2e-tests/tests/upgrade-minor/01-assert.yaml @@ -16,7 +16,7 @@ metadata: postgres-operator.crunchydata.com/pgbackrest: '' postgres-operator.crunchydata.com/pgbackrest-dedicated: '' ownerReferences: - - apiVersion: postgres-operator.crunchydata.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: upgrade-minor controller: true @@ -42,7 +42,7 @@ metadata: postgres-operator.crunchydata.com/data: postgres postgres-operator.crunchydata.com/instance-set: instance1 ownerReferences: - - apiVersion: postgres-operator.crunchydata.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: upgrade-minor controller: true @@ -70,7 +70,7 @@ metadata: annotations: deployment.kubernetes.io/revision: '1' ownerReferences: - - apiVersion: postgres-operator.crunchydata.com/v1beta1 + - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster name: upgrade-minor controller: true @@ -97,7 +97,7 @@ metadata: status: succeeded: 1 --- -apiVersion: postgres-operator.crunchydata.com/v1beta1 +apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster metadata: generation: 1 diff --git a/e2e-tests/tests/upgrade-minor/05-assert.yaml b/e2e-tests/tests/upgrade-minor/05-assert.yaml index 3019ef7c82..68dea800a5 100644 --- a/e2e-tests/tests/upgrade-minor/05-assert.yaml +++ b/e2e-tests/tests/upgrade-minor/05-assert.yaml @@ -137,7 +137,7 @@ status: - type: ProxyAvailable status: "True" - type: APIGroupMigration - reason: APIGroupMigrationCompleted + reason: APIGroupMigrationNotNeeded status: "True" pgbouncer: ready: 3 diff --git a/e2e-tests/tests/upgrade-minor/99-remove-cluster-gracefully.yaml b/e2e-tests/tests/upgrade-minor/99-remove-cluster-gracefully.yaml index 6cb4612ec0..f41f5c1c10 100644 --- a/e2e-tests/tests/upgrade-minor/99-remove-cluster-gracefully.yaml +++ b/e2e-tests/tests/upgrade-minor/99-remove-cluster-gracefully.yaml @@ -3,12 +3,8 @@ kind: TestStep delete: - apiVersion: pgv2.percona.com/v2 kind: PerconaPGCluster - metadata: - name: upgrade-minor - apiVersion: upstream.pgv2.percona.com/v1beta1 kind: PostgresCluster - metadata: - name: upgrade-minor commands: - script: |- set -o errexit @@ -16,8 +12,6 @@ commands: source ../../functions - kubectl -n ${NAMESPACE} patch postgresclusters.postgres-operator.crunchydata.com upgrade-minor --type=json -p='[{"op": "remove", "path": "/metadata/finalizers"}]' - kubectl -n ${NAMESPACE} delete postgresclusters.postgres-operator.crunchydata.com upgrade-minor || true remove_all_finalizers check_operator_panic destroy_operator diff --git a/percona/controller/testdata/sidecar-resources-cr.yaml b/percona/controller/testdata/sidecar-resources-cr.yaml index 8fe638e060..4e5579c79a 100644 --- a/percona/controller/testdata/sidecar-resources-cr.yaml +++ b/percona/controller/testdata/sidecar-resources-cr.yaml @@ -4,7 +4,7 @@ kind: PerconaPGCluster metadata: name: cluster1 spec: - crVersion: 3.0.0 + crVersion: 3.1.0 image: docker.io/perconalab/percona-postgresql-operator:main-ppg18-postgres imagePullPolicy: Always diff --git a/percona/version/version.txt b/percona/version/version.txt index 4a36342fca..fd2a01863f 100644 --- a/percona/version/version.txt +++ b/percona/version/version.txt @@ -1 +1 @@ -3.0.0 +3.1.0