Fixed Merge Conflicts

Signed-off-by: dlaw4608 <[email protected]>

.github/workflows/build-images-base.yaml

@@ -194,4 +194,4 @@ jobs:
           tags: |
             ${{ env.IMG_REGISTRY_HOST }}/${{ env.IMG_REGISTRY_ORG }}/${{ env.OPERATOR_NAME }}-catalog:${{ env.IMG_TAGS }}
       - name: Print Catalog Image URL
-        run: echo "Catalog image pushed to ${{ env.IMG_REGISTRY_HOST }}/${{ env.IMG_REGISTRY_ORG }}/${{ env.OPERATOR_NAME }}-catalog:${{ env.IMG_TAGS }}"
+        run: echo "Catalog image pushed to ${{ env.IMG_REGISTRY_HOST }}/${{ env.IMG_REGISTRY_ORG }}/${{ env.OPERATOR_NAME }}-catalog:${{ env.IMG_TAGS }}"        

.github/workflows/build-images-pr.yaml

@@ -0,0 +1,29 @@
+name: PR Conditional Build and Push Image to Quay.io Repo
+
+on:
+  pull_request_target:
+    types: [labeled, opened, synchronize, reopened]
+
+concurrency:
+  group: pr-conditional-build-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
+jobs:
+  workflow-build:
+    if: ${{ contains(github.event.pull_request.labels.*.name, 'forked_image_approved') }}
+    name: Calls build-images-base workflow
+    uses: ./.github/workflows/build-images-base.yaml
+    secrets: inherit
+    with:
+      kuadrantOperatorVersion: ${{ github.event.pull_request.user.login }}-${{ github.event.pull_request.number }}
+      kuadrantOperatorTag: ${{ github.event.pull_request.user.login }}-${{ github.event.pull_request.number }}
+
+  remove-label:
+    runs-on: ubuntu-latest
+    needs: workflow-build
+    steps:
+      - name: Remove forked_image_approved label after workflow is triggered
+      - uses: actions-ecosystem/action-remove-labels@v1
+        with:
+          labels: forked_image_approved
+          repo-token: ${{ secrets.GITHUB_TOKEN }}