From 2c0ad651e6aa8acc4d6b11bc50d9188557d904b9 Mon Sep 17 00:00:00 2001 From: Eleonora Zinchenko Date: Mon, 3 Nov 2025 17:36:42 +0200 Subject: [PATCH 1/2] K8SPG-836: Update versions for 2.8.0 release --- config/bundle/kustomization.yaml | 4 +- config/cw-bundle/kustomization.yaml | 4 +- config/manager/cluster/kustomization.yaml | 4 +- config/manager/namespace/kustomization.yaml | 4 +- deploy/bundle.yaml | 2 +- deploy/cr.yaml | 16 ++--- deploy/cw-bundle.yaml | 2 +- deploy/cw-operator.yaml | 2 +- deploy/operator.yaml | 2 +- deploy/upgrade.yaml | 8 +-- e2e-tests/release_versions | 69 +++++++++++---------- 11 files changed, 59 insertions(+), 58 deletions(-) diff --git a/config/bundle/kustomization.yaml b/config/bundle/kustomization.yaml index 90cf89956..0412fd1dd 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/perconalab/percona-postgresql-operator - newTag: main + newName: docker.io/percona/percona-postgresql-operator + newTag: 2.8.0 diff --git a/config/cw-bundle/kustomization.yaml b/config/cw-bundle/kustomization.yaml index 440d09873..0b3c810ea 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/perconalab/percona-postgresql-operator - newTag: main + newName: docker.io/percona/percona-postgresql-operator + newTag: 2.8.0 diff --git a/config/manager/cluster/kustomization.yaml b/config/manager/cluster/kustomization.yaml index 6f8f4bf12..940a80d27 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/perconalab/percona-postgresql-operator - newTag: main + newName: docker.io/percona/percona-postgresql-operator + newTag: 2.8.0 diff --git a/config/manager/namespace/kustomization.yaml b/config/manager/namespace/kustomization.yaml index a57ff786e..1e4cfc0e6 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/perconalab/percona-postgresql-operator - newTag: main + newName: docker.io/percona/percona-postgresql-operator + newTag: 2.8.0 diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml index e93e6e85a..020076242 100644 --- a/deploy/bundle.yaml +++ b/deploy/bundle.yaml @@ -53964,7 +53964,7 @@ spec: value: "false" - name: PGO_WORKERS value: "1" - image: docker.io/perconalab/percona-postgresql-operator:main + image: docker.io/percona/percona-postgresql-operator:2.8.0 imagePullPolicy: Always livenessProbe: failureThreshold: 3 diff --git a/deploy/cr.yaml b/deploy/cr.yaml index e055bc6f3..ed3064d5d 100644 --- a/deploy/cr.yaml +++ b/deploy/cr.yaml @@ -11,7 +11,7 @@ metadata: spec: crVersion: 2.8.0 # initContainer: -# image: docker.io/perconalab/percona-postgresql-operator:main +# image: docker.io/percona/percona-postgresql-operator:2.8.0 # resources: # limits: # cpu: 2.0 @@ -154,7 +154,7 @@ spec: # test-label: value - image: docker.io/perconalab/percona-postgresql-operator:main-ppg17-postgres + image: docker.io/percona/percona-distribution-postgresql:17.6-1 imagePullPolicy: Always postgresVersion: 17 # port: 5432 @@ -188,7 +188,7 @@ spec: # - secretRef: # name: instance-env-secret # initContainer: -# image: docker.io/perconalab/percona-postgresql-operator:main +# image: docker.io/percona/percona-postgresql-operator:2.8.0 # resources: # limits: # cpu: 2.0 @@ -312,7 +312,7 @@ spec: proxy: pgBouncer: replicas: 3 - image: docker.io/perconalab/percona-postgresql-operator:main-pgbouncer17 + image: docker.io/percona/percona-pgbouncer:1.24.1-1 # env: # - name: MY_ENV # value: "1000" @@ -409,7 +409,7 @@ spec: pgbackrest: # metadata: # labels: - image: docker.io/perconalab/percona-postgresql-operator:main-pgbackrest17 + image: docker.io/percona/percona-pgbackrest:2.56.0-1 # env: # - name: MY_ENV # value: "1000" @@ -417,7 +417,7 @@ spec: # - secretRef: # name: repo-host-env-secret # initContainer: -# image: docker.io/perconalab/percona-postgresql-operator:main +# image: docker.io/percona/percona-postgresql-operator:2.8.0 # resources: # limits: # cpu: 2.0 @@ -613,7 +613,7 @@ spec: pmm: enabled: false - image: docker.io/perconalab/pmm-client:dev-latest + image: docker.io/percona/pmm-client:3.4.1 # imagePullPolicy: IfNotPresent secret: cluster1-pmm-secret serverHost: monitoring-service @@ -647,7 +647,7 @@ spec: # - basebackup # extensions: -# image: docker.io/perconalab/percona-postgresql-operator:main +# image: docker.io/percona/percona-postgresql-operator:2.8.0 # imagePullPolicy: Always # storage: # type: s3 diff --git a/deploy/cw-bundle.yaml b/deploy/cw-bundle.yaml index 669b9940e..3fc6cc1c4 100644 --- a/deploy/cw-bundle.yaml +++ b/deploy/cw-bundle.yaml @@ -53962,7 +53962,7 @@ spec: value: "false" - name: PGO_WORKERS value: "1" - image: docker.io/perconalab/percona-postgresql-operator:main + image: docker.io/percona/percona-postgresql-operator:2.8.0 imagePullPolicy: Always livenessProbe: failureThreshold: 3 diff --git a/deploy/cw-operator.yaml b/deploy/cw-operator.yaml index 786141384..1abc72e4c 100644 --- a/deploy/cw-operator.yaml +++ b/deploy/cw-operator.yaml @@ -44,7 +44,7 @@ spec: value: "false" - name: PGO_WORKERS value: "1" - image: docker.io/perconalab/percona-postgresql-operator:main + image: docker.io/percona/percona-postgresql-operator:2.8.0 imagePullPolicy: Always livenessProbe: failureThreshold: 3 diff --git a/deploy/operator.yaml b/deploy/operator.yaml index c6c492333..7da02aca8 100644 --- a/deploy/operator.yaml +++ b/deploy/operator.yaml @@ -47,7 +47,7 @@ spec: value: "false" - name: PGO_WORKERS value: "1" - image: docker.io/perconalab/percona-postgresql-operator:main + image: docker.io/percona/percona-postgresql-operator:2.8.0 imagePullPolicy: Always livenessProbe: failureThreshold: 3 diff --git a/deploy/upgrade.yaml b/deploy/upgrade.yaml index 59ddf91d3..2a28427a4 100644 --- a/deploy/upgrade.yaml +++ b/deploy/upgrade.yaml @@ -4,9 +4,9 @@ metadata: name: cluster1-16-to-17 spec: postgresClusterName: cluster1 - image: docker.io/perconalab/percona-postgresql-operator:main-upgrade + image: docker.io/percona/percona-postgresql-operator:2.8.0-upgrade fromPostgresVersion: 16 toPostgresVersion: 17 - toPostgresImage: docker.io/perconalab/percona-postgresql-operator:main-ppg17-postgres - toPgBouncerImage: docker.io/perconalab/percona-postgresql-operator:main-pgbouncer17 - toPgBackRestImage: docker.io/perconalab/percona-postgresql-operator:main-pgbackrest17 + toPostgresImage: docker.io/percona/percona-distribution-postgresql:17.6-1 + toPgBouncerImage: docker.io/percona/percona-pgbouncer:1.24.1-1 + toPgBackRestImage: docker.io/percona/percona-pgbackrest:2.56.0-1 diff --git a/e2e-tests/release_versions b/e2e-tests/release_versions index 4e7b46b82..a42562244 100644 --- a/e2e-tests/release_versions +++ b/e2e-tests/release_versions @@ -1,45 +1,46 @@ # Images versions -IMAGE_OPERATOR=percona/percona-postgresql-operator:2.7.0 +IMAGE_OPERATOR=percona/percona-postgresql-operator:2.8.0 -IMAGE_POSTGRESQL17=percona/percona-postgresql-operator:2.7.0-ppg17.5.2-postgres -IMAGE_PGBOUNCER17=percona/percona-pgbouncer:1.24.1 -IMAGE_POSTGIS17=percona/percona-postgresql-operator:2.7.0-ppg17.5.2-postgres-gis3.3.8 -IMAGE_BACKREST17=percona/percona-pgbackrest:2.55.0 +IMAGE_POSTGRESQL17=percona/percona-distribution-postgresql:17.6-1 +IMAGE_PGBOUNCER17=percona/percona-pgbouncer:1.24.1-1 +IMAGE_POSTGIS17=percona/percona-postgresql-operator:2.8.0-ppg17.6-postgres-gis3.3.8 +IMAGE_BACKREST17=percona/percona-pgbackrest:2.56.0-1 -IMAGE_POSTGRESQL16=percona/percona-postgresql-operator:2.7.0-ppg16.9-postgres -IMAGE_PGBOUNCER16=percona/percona-pgbouncer:1.24.1 -IMAGE_POSTGIS16=percona/percona-postgresql-operator:2.7.0-ppg16.9-postgres-gis3.3.8 -IMAGE_BACKREST16=percona/percona-pgbackrest:2.55.0 +IMAGE_POSTGRESQL16=percona/percona-distribution-postgresql:16.10-1 +IMAGE_PGBOUNCER16=percona/percona-pgbouncer:1.24.1-1 +IMAGE_POSTGIS16=percona/percona-postgresql-operator:2.8.0-ppg16.10-postgres-gis3.3.8 +IMAGE_BACKREST16=percona/percona-pgbackrest:2.56.0-1 -IMAGE_POSTGRESQL15=percona/percona-postgresql-operator:2.7.0-ppg15.13-postgres -IMAGE_PGBOUNCER15=percona/percona-pgbouncer:1.24.1 -IMAGE_POSTGIS15=percona/percona-postgresql-operator:2.7.0-ppg15.13-postgres-gis3.3.8 -IMAGE_BACKREST15=percona/percona-pgbackrest:2.55.0 +IMAGE_POSTGRESQL15=percona/percona-distribution-postgresql:15.14-1 +IMAGE_PGBOUNCER15=percona/percona-pgbouncer:1.24.1-1 +IMAGE_POSTGIS15=percona/percona-postgresql-operator:2.8.0-ppg15.14-postgres-gis3.3.8 +IMAGE_BACKREST15=percona/percona-pgbackrest:2.56.0-1 -IMAGE_POSTGRESQL14=percona/percona-postgresql-operator:2.7.0-ppg14.18-postgres -IMAGE_PGBOUNCER14=percona/percona-pgbouncer:1.24.1 -IMAGE_POSTGIS14=percona/percona-postgresql-operator:2.7.0-ppg14.18-postgres-gis3.3.8 -IMAGE_BACKREST14=percona/percona-pgbackrest:2.55.0 +IMAGE_POSTGRESQL14=percona/percona-distribution-postgresql:14.19-1 +IMAGE_PGBOUNCER14=percona/percona-pgbouncer:1.24.1-1 +IMAGE_POSTGIS14=percona/percona-postgresql-operator:2.8.0-ppg14.19-postgres-gis3.3.8 +IMAGE_BACKREST14=percona/percona-pgbackrest:2.56.0-1 -IMAGE_POSTGRESQL13=percona/percona-postgresql-operator:2.7.0-ppg13.21-postgres -IMAGE_PGBOUNCER13=percona/percona-pgbouncer:1.24.1 -IMAGE_POSTGIS13=percona/percona-postgresql-operator:2.7.0-ppg13.21-postgres-gis3.3.8 -IMAGE_BACKREST13=percona/percona-pgbackrest:2.55.0 +IMAGE_POSTGRESQL13=percona/percona-distribution-postgresql:13.22-1 +IMAGE_PGBOUNCER13=percona/percona-pgbouncer:1.24.1-1 +IMAGE_POSTGIS13=percona/percona-postgresql-operator:2.8.0-ppg13.22-postgres-gis3.3.8 +IMAGE_BACKREST13=percona/percona-pgbackrest:2.56.0-1 -IMAGE_UPGRADE=percona/percona-postgresql-operator:2.7.0-upgrade +IMAGE_UPGRADE=percona/percona-postgresql-operator:2.8.0-upgrade -IMAGE_PMM_CLIENT=percona/pmm-client:2.44.1 +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.3.0 -IMAGE_PMM3_SERVER=percona/pmm-server:3.3.0 +IMAGE_PMM3_CLIENT=percona/pmm-client:3.4.1 +IMAGE_PMM3_SERVER=percona/pmm-server:3.4.1 # Supported k8s versions -GKE_MIN=1.30 -GKE_MAX=1.32 -EKS_MIN=1.30 -EKS_MAX=1.33 -AKS_MIN=1.30 -AKS_MAX=1.32 -OPENSHIFT_MIN=4.15.53 -OPENSHIFT_MAX=4.19.2 -MINIKUBE_MAX=1.33.1 \ No newline at end of file +GKE_MIN=1.31 +GKE_MAX=1.33 +EKS_MIN=1.31 +EKS_MAX=1.34 +AKS_MIN=1.32 +AKS_MAX=1.34 +OPENSHIFT_MIN=4.16.51 +OPENSHIFT_MAX=4.20.2 +# MINIKUBE_MAX = k8s version in MINIKUBE +MINIKUBE_MAX=1.34.0 \ No newline at end of file From e6425a6d537162b2474e3fb9e9070d3c914ee2ff Mon Sep 17 00:00:00 2001 From: Eleonora Zinchenko Date: Mon, 3 Nov 2025 17:57:35 +0200 Subject: [PATCH 2/2] K8SPG-836: use version for release reviewdog manifest testss --- .github/workflows/reviewdog.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/reviewdog.yml b/.github/workflows/reviewdog.yml index 971eb5a4a..921c73146 100644 --- a/.github/workflows/reviewdog.yml +++ b/.github/workflows/reviewdog.yml @@ -93,6 +93,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v5 - - run: | + - name: check on release branch + if: ${{ contains(github.head_ref, 'release-') || contains(github.base_ref, '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.head_ref, 'release-') || contains(github.base_ref, 'release-')) }} + run: | make generate VERSION=main git diff --exit-code