Merge branch 'main' into fix-handling-timestamps-from-barman

EnterpriseDB · Jul 8, 2024 · 63a00d0 · 63a00d0
2 parents 1e46629 + a4a043d
commit 63a00d0
Show file tree

Hide file tree

Showing 170 changed files with 6,987 additions and 1,154 deletions.
diff --git a/.github/kind_versions.json b/.github/kind_versions.json
@@ -1,5 +1,5 @@
 [
-  "v1.30.0",
+  "v1.30.2",
   "v1.29.4",
   "v1.28.9",
   "v1.27.13"

diff --git a/.github/openshift_versions.json b/.github/openshift_versions.json
@@ -1,4 +1,5 @@
 [
+  "4.16",
   "4.15",
   "4.14",
   "4.13",

diff --git a/.github/pg_versions.json b/.github/pg_versions.json
@@ -1,7 +1,7 @@
 {
   "17": [
-    "17beta1",
-    "17beta1-1"
+    "17beta2",
+    "17beta2-3"
   ],
   "16": [
     "16.3",

diff --git a/.github/renovate.json5 b/.github/renovate.json5
@@ -8,8 +8,8 @@
   "prConcurrentLimit": 5,
 // The branches renovate should target
 // PLEASE UPDATE THIS WHEN RELEASING.
-  "baseBranches": ["main","release-1.21","release-1.22", "release-1.23"],
-  "ignorePaths": ["docs/**", "config/**", "releases/**", "contribute/**", "config/**", "licenses/**"],
+  "baseBranches": ["main","release-1.22", "release-1.23"],
+  "ignorePaths": ["docs/**", "releases/**", "contribute/**", "licenses/**", "pkg/versions/**"],
   "postUpdateOptions": ["gomodTidy"],
   "semanticCommits": "enabled",
 // All PRs should have a label
@@ -214,6 +214,18 @@
       "depNameTemplate": "redhat-openshift-ecosystem/openshift-preflight",
       "versioningTemplate": "loose",
       "extractVersionTemplate": "^(?<version>\\d+\\.\\d+\\.\\d+)"
+    }, {
+      "fileMatch": [
+        "^config\\/olm-scorecard\\/patches\\/basic\\.config\\.yaml$",
+        "^config\\/olm-scorecard\\/patches\\/olm\\.config\\.yaml$",
+      ],
+      "matchStrings": [
+        "image: quay.io/operator-framework/scorecard-test:(?<currentValue>.*?)\\n",
+      ],
+      "datasourceTemplate": "docker",
+      "versioningTemplate": "loose",
+      "depNameTemplate": "quay.io/operator-framework/scorecard-test",
+      "extractVersionTemplate": "^(?<version>v\\d+\\.\\d+\\.\\d+)"
     },{
       // We want a PR to bump Default Container Images versions.
       "fileMatch": [
@@ -372,6 +384,7 @@
       "matchPackagePrefixes": [
         "operator-framework",
         "redhat-openshift-ecosystem",
+	"quay.io/operator-framework",
       ],
       "separateMajorMinor": "false",
       "pinDigests": false

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
@@ -27,11 +27,10 @@ jobs:
         uses: actions-ecosystem/action-add-labels@v1
         if: ${{ !contains(github.event.pull_request.labels.*.name, 'do not backport') }}
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          github_token: ${{ secrets.REPO_GHA_PAT }}
           number:  ${{ github.event.pull_request.number }}
           labels: |
             backport-requested :arrow_backward:
-            release-1.21
             release-1.22
             release-1.23
       -
@@ -52,9 +51,9 @@ jobs:
         uses: actions-ecosystem/action-remove-labels@v1
         if: ${{ contains(github.event.pull_request.labels.*.name, 'do not backport') }}
         with:
+          github_token: ${{ secrets.REPO_GHA_PAT }}
           labels: |
             backport-requested :arrow_backward:
-            release-1.21
             release-1.22
             release-1.23
 
@@ -72,7 +71,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branch: [release-1.21, release-1.22, release-1.23]
+        branch: [release-1.22, release-1.23]
     env:
       PR: ${{ github.event.pull_request.number }}
     outputs:

diff --git a/.github/workflows/continuous-delivery.yml b/.github/workflows/continuous-delivery.yml
@@ -36,7 +36,7 @@ env:
   GOLANG_VERSION: "1.22.x"
   KUBEBUILDER_VERSION: "2.3.1"
   KIND_VERSION: "v0.23.0"
-  ROOK_VERSION: "v1.14.5"
+  ROOK_VERSION: "v1.14.8"
   EXTERNAL_SNAPSHOTTER_VERSION: "v8.0.1"
   OPERATOR_IMAGE_NAME: "ghcr.io/${{ github.repository }}-testing"
   BUILD_PUSH_PROVENANCE: ""
@@ -68,7 +68,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branch: [release-1.21, release-1.22, release-1.23]
+        branch: [release-1.22, release-1.23]
     steps:
       - name: Invoke workflow with inputs
         uses: benc-uk/workflow-dispatch@v1
@@ -382,7 +382,7 @@ jobs:
           password: ${{ env.REGISTRY_PASSWORD }}
       -
         name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           platforms: ${{ env.PLATFORMS }}
           context: .
@@ -397,7 +397,7 @@ jobs:
           cache-to: ${{ env.BUILD_PUSH_CACHE_TO }}
       -
         name: Build and push UBI8
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           platforms: ${{ env.PLATFORMS }}
           context: .
@@ -478,7 +478,7 @@ jobs:
       # NOTE: we only fire this in TEST DEPTH = 4, as that is the level of the
       # upgrade test
         name: Build and push image for upgrade test
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         if: |
           always() && !cancelled() &&
           needs.evaluate_options.outputs.test_level == '4'
@@ -2072,6 +2072,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           path: test-artifacts
+          pattern: testartifacts-*
 
       - name: Flatten all artifacts onto directory
         # The download-artifact action, since we did not give it a name,
@@ -2150,7 +2151,7 @@ jobs:
       - name: Check preconditions
         id: get_pr_number_and_labels
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.REPO_GHA_PAT }}
         run: |
           ok_label=$(gh pr view "${{ github.event.issue.number }}" --json labels -q ".labels.[].name" 2>/dev/null | grep "ok to merge :ok_hand:" || :)
           echo "OK_LABEL=${ok_label}" >> $GITHUB_ENV
@@ -2160,7 +2161,7 @@ jobs:
           env.OK_LABEL == ''
         uses: actions-ecosystem/[email protected]
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          github_token: ${{ secrets.REPO_GHA_PAT }}
           number: ${{ github.event.issue.number }}
           labels: "ok to merge :ok_hand:"
 
@@ -2179,7 +2180,7 @@ jobs:
       - name: Check preconditions
         id: get_pr_number_and_labels
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.REPO_GHA_PAT }}
         run: |
           ok_label=$(gh pr view "${{ github.event.issue.number }}" --json labels -q ".labels.[].name" 2>/dev/null | grep "ok to merge :ok_hand:" || :)
           echo "OK_LABEL=${ok_label}" >> $GITHUB_ENV
@@ -2189,6 +2190,6 @@ jobs:
           env.OK_LABEL != ''
         uses: actions-ecosystem/[email protected]
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          github_token: ${{ secrets.REPO_GHA_PAT }}
           number: ${{ github.event.issue.number }}
           labels: "ok to merge :ok_hand:"
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -52,7 +52,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branch: [release-1.21, release-1.22]
+        branch: [release-1.22, release-1.23]
 
     steps:
       - name: Invoke workflow with inputs
@@ -567,7 +567,7 @@ jobs:
           password: ${{ env.REGISTRY_PASSWORD }}
 
       - name: Build for scan distroless image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           platforms: "linux/amd64"
           context: .
@@ -587,7 +587,7 @@ jobs:
           accept-keywords: key
 
       - name: Build for scan UBI8 image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           platforms: "linux/amd64"
           context: .
@@ -609,7 +609,7 @@ jobs:
           accept-keywords: key
 
       - name: Build for scan UBI9 image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           platforms: "linux/amd64"
           context: .
@@ -652,7 +652,7 @@ jobs:
           sarif_file: snyk.sarif
 
       - name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           platforms: ${{ env.PLATFORMS }}
           context: .
@@ -666,7 +666,7 @@ jobs:
           cache-to: ${{ env.BUILD_PUSH_CACHE_TO }}
 
       - name: Build and push UBI8
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           platforms: ${{ env.PLATFORMS }}
           context: .
@@ -677,7 +677,7 @@ jobs:
           tags: ${{ steps.docker-meta-ubi8.outputs.tags }}
 
       - name: Build and push UBI9
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           platforms: ${{ env.PLATFORMS }}
           context: .

diff --git a/.github/workflows/latest-postgres-version-check.yml b/.github/workflows/latest-postgres-version-check.yml
@@ -69,7 +69,7 @@ jobs:
         if: env.LATEST_POSTGRES_VERSION_IMAGE != env.CURRENT_POSTGRES_VERSION_IMAGE
         uses: peter-evans/create-pull-request@v6
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.REPO_GHA_PAT }}
         with:
           title: "feat: update default PostgreSQL version to ${{ env.LATEST_POSTGRES_VERSION }}"
           body: "Update default PostgreSQL version from ${{ env.CURRENT_POSTGRES_VERSION }} to ${{ env.LATEST_POSTGRES_VERSION }}"
@@ -82,7 +82,7 @@ jobs:
         if: env.LATEST_POSTGRES_VERSION_IMAGE == env.CURRENT_POSTGRES_VERSION_IMAGE
         uses: peter-evans/create-pull-request@v6
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.REPO_GHA_PAT }}
         with:
           title: "test: Updated Postgres versions used in E2E tests"
           body: "Update the Postgres versions used in E2E tests"

diff --git a/.github/workflows/public-cloud-k8s-versions-check.yml b/.github/workflows/public-cloud-k8s-versions-check.yml
@@ -108,7 +108,7 @@ jobs:
         name: Create Pull Request if versions have been updated
         uses: peter-evans/create-pull-request@v6
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.REPO_GHA_PAT }}
           title: "feat: Public Cloud K8S versions update"
           body: "Update the versions used to test the operator on public cloud providers"
           branch: "k8s-cloud-versions-update"

diff --git a/.github/workflows/release-pr.yml b/.github/workflows/release-pr.yml
@@ -17,9 +17,13 @@ jobs:
       -
         name: Get tag
         run: |
-          TAG=${GITHUB_REF##*/}
-          DEST=$(echo ${TAG#v} | awk -F '[.]' '{print "release-"$1"."$2}')
-          echo "TAG=${TAG#v}" >> $GITHUB_ENV
+          TAG=${GITHUB_REF##*/v}
+          if [[ "${TAG}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            DEST=$(echo ${TAG} | awk -F '[.]' '{print "release-"$1"."$2}')
+          else
+            DEST="main"
+          fi
+          echo "TAG=${TAG}" >> $GITHUB_ENV
           echo "DEST=${DEST}" >> $GITHUB_ENV
       -
         name: Pull Request
-Original file line number
+Diff line change
@@ -1,4 +1,5 @@
     [
+      "4.16",
       "4.15",
       "4.14",
       "4.13",
@@ Expand Down @@