From 07bcdffef04d8fb515e0c2d386c6dbcaccbe4ce3 Mon Sep 17 00:00:00 2001
From: "igor.grzankowski" <igor.grzankowski@splunk.com>
Date: Tue, 14 Jan 2025 20:32:53 +0100
Subject: [PATCH] Comment out vurneability-scan

---
 .../merge-develop-to-main-workflow.yml        | 153 ++++++++++--------
 1 file changed, 84 insertions(+), 69 deletions(-)

diff --git a/.github/workflows/merge-develop-to-main-workflow.yml b/.github/workflows/merge-develop-to-main-workflow.yml
index a5c115fd2..4366accfb 100644
--- a/.github/workflows/merge-develop-to-main-workflow.yml
+++ b/.github/workflows/merge-develop-to-main-workflow.yml
@@ -19,89 +19,104 @@ jobs:
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/develop'
     steps:
-    - uses: actions/checkout@v2
-      with:
-        ref: main
-    - name: Reset main branch
-      run: |
-        git fetch origin develop:develop
-        git reset --hard develop
-    - name: Dotenv Action
-      id: dotenv
-      uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359
-    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v3.10.1
-      with:
-        branch: "promote-develop-to-main-${{ github.event.inputs.release_version }}"
-        base: "main"
-        title: "Promote Develop to main for Splunk Operator Release ${{ github.event.inputs.release_version }}"
-        reviewers: "${{ steps.dotenv.outputs.REVIEWERS }}"
-        body: |
-          Automated Pull Request To Merge Develop To Main For Release Version ${{ github.event.inputs.release_version }}
+      - uses: actions/checkout@v2
+        with:
+          ref: main
+      - name: Reset main branch
+        run: |
+          git fetch origin develop:develop
+          git reset --hard develop
+      - name: Dotenv Action
+        id: dotenv
+        uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v3.10.1
+        with:
+          branch: "promote-develop-to-main-${{ github.event.inputs.release_version }}"
+          base: "main"
+          title: "Promote Develop to main for Splunk Operator Release ${{ github.event.inputs.release_version }}"
+          reviewers: "${{ steps.dotenv.outputs.REVIEWERS }}"
+          body: |
+            Automated Pull Request To Merge Develop To Main For Release Version ${{ github.event.inputs.release_version }}
 
   rc-release:
     runs-on: ubuntu-latest
     needs: pull-request
     if: github.ref == 'refs/heads/develop'
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-      with:
-        ref: "promote-develop-to-main-${{ github.event.inputs.release_version }}"
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          ref: "promote-develop-to-main-${{ github.event.inputs.release_version }}"
 
-    - name: Deep Fetch
-      run: |
-        git fetch --prune --unshallow
+      - name: Deep Fetch
+        run: |
+          git fetch --prune --unshallow
 
-    - name: Dotenv Action
-      id: dotenv
-      uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2.5.0
+      - name: Dotenv Action
+        id: dotenv
+        uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2.5.0
 
-    - name: Configure Docker Credentials
-      uses: docker/login-action@v1
-      with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_PUSH_TOKEN}}
+      - name: Configure Docker Credentials
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PUSH_TOKEN}}
 
-    - name: Setup Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: ${{ steps.dotenv.outputs.GO_VERSION }}
+      - name: Setup Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ steps.dotenv.outputs.GO_VERSION }}
 
-    - name: Install goveralls
-      run: |
-        go get github.com/mattn/goveralls@latest
+      - name: Install goveralls
+        run: |
+          go get github.com/mattn/goveralls@latest
 
-    - name: Install Operator SDK
-      run: |
-        export ARCH=$(case $(uname -m) in x86_64) echo -n amd64 ;; aarch64) echo -n arm64 ;; *) echo -n $(uname -m) ;; esac)
-        export OS=$(uname | awk '{print tolower($0)}')
-        export OPERATOR_SDK_DL_URL=https://github.com/operator-framework/operator-sdk/releases/download/${{ steps.dotenv.outputs.OPERATOR_SDK_VERSION }}
-        sudo curl -LO ${OPERATOR_SDK_DL_URL}/operator-sdk_${OS}_${ARCH}
-        sudo chmod +x operator-sdk_${OS}_${ARCH}
-        sudo mv operator-sdk_${OS}_${ARCH} /usr/local/bin/operator-sdk
+      - name: Install Operator SDK
+        run: |
+          export ARCH=$(case $(uname -m) in x86_64) echo -n amd64 ;; aarch64) echo -n arm64 ;; *) echo -n $(uname -m) ;; esac)
+          export OS=$(uname | awk '{print tolower($0)}')
+          export OPERATOR_SDK_DL_URL=https://github.com/operator-framework/operator-sdk/releases/download/${{ steps.dotenv.outputs.OPERATOR_SDK_VERSION }}
+          sudo curl -LO ${OPERATOR_SDK_DL_URL}/operator-sdk_${OS}_${ARCH}
+          sudo chmod +x operator-sdk_${OS}_${ARCH}
+          sudo mv operator-sdk_${OS}_${ARCH} /usr/local/bin/operator-sdk
 
-    - name: Build Splunk Operator Image
-      run: |
-        make docker-build IMG=splunk/splunk-operator-rc:${{ github.event.inputs.release_version }}-RC${{ github.event.inputs.release_candiate_version }}
+      # Build and push UBI image
+      - name: Build UBI Image
+        run: |
+          make docker-build IMG=splunk/splunk-operator-rc:${{ github.event.inputs.release_version }}-RC${{ github.event.inputs.release_candiate_version }} BASE_IMAGE=ubi8/ubi BASE_IMAGE_VERSION=latest
 
-    - name: Generate Release Artifacts
-      run: |
-        make generate-artifacts  IMG=splunk/splunk-operator-rc:${{ github.event.inputs.release_version }}-RC${{ github.event.inputs.release_candiate_version }} VERSION=${{ github.event.inputs.release_version }} SPLUNK_ENTERPRISE_IMAGE=splunk/splunk:${{ github.event.inputs.enterprise_version }}
+      - name: Push UBI Image
+        run: |
+          make docker-push IMG=splunk/splunk-operator-rc:${{ github.event.inputs.release_version }}-RC${{ github.event.inputs.release_candiate_version }}
 
-    - name: Push release RC Versioned Image
-      run: |
-        make docker-push IMG=splunk/splunk-operator-rc:${{ github.event.inputs.release_version }}-RC${{ github.event.inputs.release_candiate_version }}
+      # Build and push Distroless image
+      - name: Build Distroless Image
+        run: |
+          make docker-build IMG=splunk/splunk-operator:${{ github.event.inputs.release_version }}-distroless-RC${{ github.event.inputs.release_candiate_version }} BASE_IMAGE=gcr.io/distroless/static BASE_IMAGE_VERSION=latest
 
-    - name: Tag default Release Candidate Image and Push
-      run: |
-        docker tag splunk/splunk-operator-rc:${{ github.event.inputs.release_version }}-RC${{ github.event.inputs.release_candiate_version }} splunk/splunk-operator-rc:${{ github.event.inputs.release_version }}-RC
-        docker push splunk/splunk-operator-rc:${{ github.event.inputs.release_version }}-RC
+      - name: Push Distroless Image
+        run: |
+          make docker-push IMG=splunk/splunk-operator:${{ github.event.inputs.release_version }}-distroless-RC${{ github.event.inputs.release_candiate_version }}
 
-    - name: Upload Release Artifacts
-      uses: actions/upload-artifact@v4.4.0
-      with:
-        name: "release-artifacts-${{ github.event.inputs.release_version }}-RC"
-        path: "release-**"
\ No newline at end of file
+      - name: Tag and Push Default UBI RC Image
+        run: |
+          docker tag splunk/splunk-operator-rc:${{ github.event.inputs.release_version }}-RC${{ github.event.inputs.release_candiate_version }} splunk/splunk-operator-rc:${{ github.event.inputs.release_version }}-RC
+          docker push splunk/splunk-operator-rc:${{ github.event.inputs.release_version }}-RC
+
+      - name: Tag and Push Default Distroless RC Image
+        run: |
+          docker tag splunk/splunk-operator:${{ github.event.inputs.release_version }}-distroless-RC${{ github.event.inputs.release_candiate_version }} splunk/splunk-operator:${{ github.event.inputs.release_version }}-distroless-RC
+          docker push splunk/splunk-operator:${{ github.event.inputs.release_version }}-distroless-RC
+
+      - name: Generate Release Artifacts
+        run: |
+          make generate-artifacts IMG=splunk/splunk-operator-rc:${{ github.event.inputs.release_version }}-RC${{ github.event.inputs.release_candiate_version }} VERSION=${{ github.event.inputs.release_version }} SPLUNK_ENTERPRISE_IMAGE=splunk/splunk:${{ github.event.inputs.enterprise_version }}
+
+      - name: Upload Release Artifacts
+        uses: actions/upload-artifact@v4.4.0
+        with:
+          name: "release-artifacts-${{ github.event.inputs.release_version }}-RC"
+          path: "release-**"
\ No newline at end of file