Merge pull request noobaa#1421 from liranmauda/liran-backport-into-5_17

[backport into 5.17] Backports into 5.17
dannyzaken · Aug 27, 2024 · 825cbea · 825cbea
2 parents 794c91f + a2e818c
commit 825cbea
Show file tree

Hide file tree

Showing 38 changed files with 546 additions and 356 deletions.
diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml
@@ -1,14 +1,14 @@
 name: Manual Operator Build Dispatch
 
-on: 
+on:
   workflow_dispatch:
     inputs:
       branch:
-        description: 'Branch to Build From'
+        description: "Branch to Build From"
         required: true
       tag:
-        description: 'Additional tag for the build (such as alpha, beta, etc.) - Optional'
-        default: ''
+        description: "Additional tag for the build (such as alpha, beta, etc.) - Optional"
+        default: ""
 
 jobs:
   publish-image:
@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: ${{ github.event.inputs.branch }}
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: "1.21"
 
@@ -74,17 +74,18 @@ jobs:
         env:
           DOCKERHUB_OWNER: ${{ secrets.GHACTIONSDOCKERHUBNAME }}
         run: |
-            make image VERSION=latest
-            docker tag  noobaa/noobaa-operator ${{ steps.prep.outputs.operatortags }}
-            docker push ${{ steps.prep.outputs.operatortags }}
+          make image VERSION=latest
+          docker tag  noobaa/noobaa-operator ${{ steps.prep.outputs.operatortags }}
+          docker push ${{ steps.prep.outputs.operatortags }}
 
       - name: Build Bundle
         run: |
           make bundle-image \
           csv-name=noobaa-operator.clusterserviceversion.yaml \
           core-image=quay.io/${{ github.event.inputs.branch }}-${{ steps.prep.outputs.version }}${{ steps.suffix.outputs.suffix }} \
           operator-image=quay.io/${{ steps.prep.outputs.operatortags }} \
-          db-image=centos/postgresql-12-centos7 \
+          db-image=centos/postgresql-15-centos7 \
+          psql-12-image=centos/postgresql-12-centos7 \
           obc-crd="owned" \
           BUNDLE_IMAGE=quay.io/${{ steps.prep.outputs.operatorbundletags }}
 
@@ -95,9 +96,9 @@ jobs:
         env:
           DOCKERHUB_OWNER: ${{ secrets.GHACTIONQUAYNAME }}
         run: |
-            docker tag ${{ steps.prep.outputs.operatortags }} quay.io/${{ steps.prep.outputs.operatortags }} 
-            docker push quay.io/${{ steps.prep.outputs.operatortags }} 
-            docker push quay.io/${{ steps.prep.outputs.operatorbundletags }}
+          docker tag ${{ steps.prep.outputs.operatortags }} quay.io/${{ steps.prep.outputs.operatortags }} 
+          docker push quay.io/${{ steps.prep.outputs.operatortags }} 
+          docker push quay.io/${{ steps.prep.outputs.operatorbundletags }}
 
       - name: Push to ocs-dev as latest
         env:
@@ -108,7 +109,7 @@ jobs:
           docker push quay.io/${{ steps.prep.outputs.ocsdevlatest }}
 
       - name: Push CLI Binary
-        run: |         
+        run: |
           make cli
           make release-cli VERSION=-${{ github.event.inputs.branch }}-${{ steps.prep.outputs.version }}${{ steps.suffix.outputs.suffix }}
           #noobaa-operator-cli

diff --git a/.github/workflows/releaser.yaml b/.github/workflows/releaser.yaml
@@ -24,7 +24,7 @@ jobs:
       - name: Fetch all tags
         run: git fetch --force --tags
       - name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v5
         with:
           go-version: 1.21
       - name: Release

diff --git a/.github/workflows/run_admission_test.yml b/.github/workflows/run_admission_test.yml
@@ -16,7 +16,7 @@ jobs:
           path: "noobaa-operator"
 
       - name: Setup Go on runner
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: "1.21"
 
@@ -84,7 +84,7 @@ jobs:
 
       - name: Save logs
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: admission-tests-logs
           path: noobaa-operator/admission-tests-logs

diff --git a/.github/workflows/run_ci.yml b/.github/workflows/run_ci.yml
@@ -16,8 +16,7 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v4
-      - uses: actions/setup-go@v2 # Could not change to version 3, see issue:
-        # https://github.com/noobaa/noobaa-operator/issues/1031
+      - uses: actions/setup-go@v5
         with:
           go-version: "1.21"
 
@@ -50,7 +49,7 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v4
-      - uses: actions/setup-go@v2
+      - uses: actions/setup-go@v5
         with:
           go-version: "1.21"
 
@@ -79,7 +78,7 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v4
-      - uses: actions/setup-go@v2
+      - uses: actions/setup-go@v5
         with:
           go-version: "1.21"
 

diff --git a/.github/workflows/run_cosi_test.yaml b/.github/workflows/run_cosi_test.yaml
@@ -18,7 +18,7 @@ jobs:
           path: "noobaa-operator"
 
       - name: Setup Go on runner
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: "1.21"
 
@@ -91,7 +91,7 @@ jobs:
 
       - name: Save logs - COSI
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: cosi-tests-logs
           path: noobaa-operator/cosi-tests-logs
diff --git a/.github/workflows/run_hac_test.yml b/.github/workflows/run_hac_test.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: "1.21"
 

diff --git a/.github/workflows/run_kms_azure_vault_test.yml b/.github/workflows/run_kms_azure_vault_test.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: "1.21"
 

diff --git a/.github/workflows/run_kms_dev_test.yml b/.github/workflows/run_kms_dev_test.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: "1.21"
 

diff --git a/.github/workflows/run_kms_ibm_kp_test.yml b/.github/workflows/run_kms_ibm_kp_test.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: "1.21"
 

diff --git a/.github/workflows/run_kms_kmip_test.yml b/.github/workflows/run_kms_kmip_test.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: "1.21"
 

diff --git a/.github/workflows/run_kms_rotate_test.yml b/.github/workflows/run_kms_rotate_test.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: "1.21"
 

diff --git a/.github/workflows/run_kms_tls_sa_test.yml b/.github/workflows/run_kms_tls_sa_test.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: "1.21"
 

diff --git a/.github/workflows/run_kms_tls_token_test.yml b/.github/workflows/run_kms_tls_token_test.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: "1.21"
 

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: "1.21"