Merge branch 'main' into dependabot/go_modules/go.opentelemetry.io/otel/exporters/stdout/stdouttrace-1.39.0

Author: hors

.e2eignore

@@ -9,4 +9,3 @@ README.md
 .gitignore
 release_versions
 .e2eignore
-.snyk

.github/workflows/scan.yml

@@ -30,27 +30,10 @@ jobs:
           export DOCKER_DEFAULT_PLATFORM='linux/arm64'
           make build-docker-image
 
-      - name: Run Snyk vulnerability scanner image (linux/arm64)
-        uses: snyk/actions/docker@master
-        env:
-          SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
-        with:
-          image: '${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}-arm64'
-          args: --platform=linux/arm64 --severity-threshold=high --exclude-base-image-vulns --file=./build/postgres-operator/Dockerfile -fail-on=upgradable
-
       - name: Build an image from Dockerfile (linux/amd64)
         run: |
           export IMAGE=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}-amd64
           export DOCKER_PUSH=0
           export DOCKER_SQUASH=0
           export DOCKER_DEFAULT_PLATFORM='linux/amd64'
           make build-docker-image
-
-      - name: Run Snyk vulnerability scanner image (linux/amd64)
-        uses: snyk/actions/docker@master
-        env:
-          SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
-        with:
-          image: '${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}-amd64'
-          args: --platform=linux/amd64 --severity-threshold=high --exclude-base-image-vulns --file=./build/postgres-operator/Dockerfile -fail-on=upgradable
-

.snyk

@@ -1,37 +1,37 @@
 # Images versions
-IMAGE_OPERATOR=percona/percona-postgresql-operator:2.8.1
+IMAGE_OPERATOR=percona/percona-postgresql-operator:2.8.2
 
-IMAGE_POSTGRESQL18=percona/percona-distribution-postgresql:18.1-1
+IMAGE_POSTGRESQL18=percona/percona-distribution-postgresql:18.1-3
 IMAGE_PGBOUNCER18=percona/percona-pgbouncer:1.25.0-1
-IMAGE_POSTGIS18=percona/percona-postgresql-operator:2.8.1-ppg18.1-postgres-gis3.5.4
+IMAGE_POSTGIS18=percona/percona-postgresql-operator:2.8.2-ppg18.1-postgres-gis3.5.4
 IMAGE_BACKREST18=percona/percona-pgbackrest:2.57.0-1
 
-IMAGE_POSTGRESQL17=percona/percona-distribution-postgresql:17.7-1
+IMAGE_POSTGRESQL17=percona/percona-distribution-postgresql:17.7-2
 IMAGE_PGBOUNCER17=percona/percona-pgbouncer:1.25.0-1
-IMAGE_POSTGIS17=percona/percona-postgresql-operator:2.8.1-ppg17.7-postgres-gis3.3.8
+IMAGE_POSTGIS17=percona/percona-postgresql-operator:2.8.2-ppg17.7-postgres-gis3.3.8
 IMAGE_BACKREST17=percona/percona-pgbackrest:2.57.0-1
 
-IMAGE_POSTGRESQL16=percona/percona-distribution-postgresql:16.11-1
+IMAGE_POSTGRESQL16=percona/percona-distribution-postgresql:16.11-2
 IMAGE_PGBOUNCER16=percona/percona-pgbouncer:1.25.0-1
-IMAGE_POSTGIS16=percona/percona-postgresql-operator:2.8.1-ppg16.11-postgres-gis3.3.8
+IMAGE_POSTGIS16=percona/percona-postgresql-operator:2.8.2-ppg16.11-postgres-gis3.3.8
 IMAGE_BACKREST16=percona/percona-pgbackrest:2.57.0-1
 
-IMAGE_POSTGRESQL15=percona/percona-distribution-postgresql:15.15-1
+IMAGE_POSTGRESQL15=percona/percona-distribution-postgresql:15.15-2
 IMAGE_PGBOUNCER15=percona/percona-pgbouncer:1.25.0-1
-IMAGE_POSTGIS15=percona/percona-postgresql-operator:2.8.1-ppg15.15-postgres-gis3.3.8
+IMAGE_POSTGIS15=percona/percona-postgresql-operator:2.8.2-ppg15.15-postgres-gis3.3.8
 IMAGE_BACKREST15=percona/percona-pgbackrest:2.57.0-1
 
-IMAGE_POSTGRESQL14=percona/percona-distribution-postgresql:14.20-1
+IMAGE_POSTGRESQL14=percona/percona-distribution-postgresql:14.20-2
 IMAGE_PGBOUNCER14=percona/percona-pgbouncer:1.25.0-1
-IMAGE_POSTGIS14=percona/percona-postgresql-operator:2.8.1-ppg14.20-postgres-gis3.3.8
+IMAGE_POSTGIS14=percona/percona-postgresql-operator:2.8.2-ppg14.20-postgres-gis3.3.8
 IMAGE_BACKREST14=percona/percona-pgbackrest:2.57.0-1
 
-IMAGE_POSTGRESQL13=percona/percona-distribution-postgresql:13.23-1
+IMAGE_POSTGRESQL13=percona/percona-distribution-postgresql:13.23-2
 IMAGE_PGBOUNCER13=percona/percona-pgbouncer:1.25.0-1
-IMAGE_POSTGIS13=percona/percona-postgresql-operator:2.8.1-ppg13.23-postgres-gis3.3.8
+IMAGE_POSTGIS13=percona/percona-postgresql-operator:2.8.2-ppg13.23-postgres-gis3.3.8
 IMAGE_BACKREST13=percona/percona-pgbackrest:2.57.0-1
 
-IMAGE_UPGRADE=percona/percona-postgresql-operator:2.8.1-upgrade
+IMAGE_UPGRADE=percona/percona-postgresql-operator:2.8.2-upgrade
 
 IMAGE_PMM_CLIENT=percona/pmm-client:2.44.1-1
 IMAGE_PMM_SERVER=percona/pmm-server:2.44.1

e2e-tests/release_versions

@@ -120,7 +120,7 @@ kind: PerconaPGCluster
 metadata:
   name: upgrade-consistency
 spec:
-  crVersion: 2.8.1
+  crVersion: 2.8.2
 status:
   pgbouncer:
     ready: 3

e2e-tests/tests/upgrade-consistency/02-assert.yaml

@@ -10,7 +10,7 @@ commands:
 
       get_cr \
         | yq eval '
-            .spec.crVersion="2.8.1"' - \
+            .spec.crVersion="2.8.2"' - \
         | kubectl -n "${NAMESPACE}" apply -f -
 
       sleep 10

e2e-tests/tests/upgrade-consistency/02-patch-cluster.yaml

@@ -93,7 +93,7 @@ var olmClusterYAML = `
 metadata:
   name: olm
 spec:
-  postgresVersion: 13
+  postgresVersion: 17
   image: postgres
   instances:
   - name: register-now
@@ -231,7 +231,7 @@ var _ = Describe("PostgresCluster Reconciler", func() {
 metadata:
   name: carlos
 spec:
-  postgresVersion: 13
+  postgresVersion: 17
   image: postgres
   instances:
   - name: samba
@@ -438,7 +438,7 @@ spec:
 metadata:
   name: carlos
 spec:
-  postgresVersion: 13
+  postgresVersion: 17
   image: postgres
   instances:
   - name: samba
@@ -660,7 +660,7 @@ spec:
 metadata:
   name: test-cluster
 spec:
-  postgresVersion: 13
+  postgresVersion: 17
   image: postgres
   instances:
   - name: instance1