Merge remote-tracking branch 'upstream/main' into rhoai-2.22

Author: jiridanek

.github/workflows/build-notebooks-pr-rhel.yaml

@@ -20,7 +20,7 @@ permissions:
 env:
   # language=json
   contributors: |
-    ["atheo89", "andyatmiami", "caponetto", "daniellutz", "dibryant", "harshad16", "jesuino", "jiridanek", "jstourac", "paulovmr", "Fiona-Waters", "grdryn", "kryanbeane", "mtchoum1"]
+    ["atheo89", "andyatmiami", "caponetto", "daniellutz", "dibryant", "harshad16", "jesuino", "jiridanek", "jstourac", "paulovmr", "Fiona-Waters", "grdryn", "kryanbeane", "mtchoum1", "obrown1205"]
 
 jobs:
   gen:

.github/workflows/instant-merge.yaml

@@ -8,20 +8,13 @@ on:  # yamllint disable-line rule:truthy
     paths:
       - manifests/base/params-latest.env
 
-permissions:
-  contents: write
-  pull-requests: write
-  checks: write
-  security-events: write
-  statuses: write
-
 jobs:
   instant-merge:
     runs-on: ubuntu-latest
     steps:
       - name: instant-merge
         if: ${{ github.event.sender.login == 'red-hat-konflux[bot]' && ( contains(github.event.pull_request.title, 'Update odh-workbench-jupyter-') || contains(github.event.pull_request.title, 'Update odh-workbench-codeserver-') || contains(github.event.pull_request.title, 'Update odh-pipeline-runtime-') ) }}
         env:
-          GITHUB_TOKEN: ${{ github.token }}
+          GITHUB_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }}
         run: |
           gh pr merge --merge --admin ${{ github.event.pull_request.html_url }}