From 6fbef80c51c87f8b7d0bd43199efa64bc849ec73 Mon Sep 17 00:00:00 2001 From: Misha Sugakov Date: Wed, 26 Nov 2025 15:16:51 +0100 Subject: [PATCH 1/4] Update codeowners --- .github/CODEOWNERS | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index b5e33db8da0d7..54d3bf6149886 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -81,12 +81,14 @@ operator/**/* @stackrox/install /sensor/kubernetes/listener/resources/secrets* @stackrox/scanner /SCANNER_VERSION @stackrox/scanner -# The RHTAP maintainers for ACS review all changes related to the Konflux (f.k.a. RHTAP) pipelines, such as new -# pipelines, parameter changes or automated task updates as well as Dockerfile updates. -**/konflux.*Dockerfile @stackrox/rhtap-maintainers -/.konflux/ @stackrox/rhtap-maintainers -/.tekton/ @stackrox/rhtap-maintainers -rpms.* @stackrox/rhtap-maintainers +# The Konflux maintainers for ACS review all changes related to the Konflux pipelines, Dockerfiles, etc. +# Release engineers need to merge MintMaker PRs at the time of release. +# rhacs-bot needs ability to auto-approve MintMaker PRs for automated task and security updates. +**/konflux.*Dockerfile @stackrox/konflux-maintainers-no-email @stackrox/release-mgmt-no-email @rhacs-bot +/.tekton/ @stackrox/konflux-maintainers-no-email @stackrox/release-mgmt-no-email @rhacs-bot +rpms.* @stackrox/konflux-maintainers-no-email @stackrox/release-mgmt-no-email @rhacs-bot +/.konflux/ @stackrox/konflux-maintainers +.github/renovate.json5 @stackrox/konflux-maintainers # Dependencies From 74dedf8b0dad082bcc4b4218c0b930b73a7d37b5 Mon Sep 17 00:00:00 2001 From: Misha Sugakov Date: Wed, 26 Nov 2025 15:17:05 +0100 Subject: [PATCH 2/4] Add workflow for tagging konflux-maintainers for review --- .github/workflows/tag-more-reviewers.yaml | 30 +++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/workflows/tag-more-reviewers.yaml diff --git a/.github/workflows/tag-more-reviewers.yaml b/.github/workflows/tag-more-reviewers.yaml new file mode 100644 index 0000000000000..f4233751cab61 --- /dev/null +++ b/.github/workflows/tag-more-reviewers.yaml @@ -0,0 +1,30 @@ +name: Tag more reviewers + +on: + pull_request: + types: + - review_requested + +jobs: + tag-konflux-maintainers: + # We have lots of PR traffic from MintMaker (acting as `red-hat-konflux[bot]`), and so it's unsustainable to go + # through these emails every day. Therefore, the notifications are disabled for `konflux-maintainers-no-email` + # team that's set as owner in CODEOWNERS for the Konflux stuff. + # At the same time, we want to be notified when humans, not the bot, request reviews (which happens automatically + # again through CODEOWNERS) for the Konflux-related files. This job invites `konflux-maintainers` team for review + # for such cases. + if: | + github.event.requested_team.name == 'konflux-maintainers-no-email' && + github.event.pull_request.user.login != 'red-hat-konflux[bot]' + env: + GH_TOKEN: ${{ secrets.RHACS_BOT_GITHUB_TOKEN }} + runs-on: ubuntu-latest + steps: + - name: Tag Konflux Maintainers for review + run: | + exec gh api \ + --method POST \ + -H "Accept: application/vnd.github+json" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + "/repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/requested_reviewers" \ + --input - <<< '{ "team_reviewers": [ "konflux-maintainers" ] }' From 2fdfa9b46f47f78d74a86f6774b7cd004339e348 Mon Sep 17 00:00:00 2001 From: Misha Sugakov Date: Tue, 2 Dec 2025 18:39:27 +0100 Subject: [PATCH 3/4] Get rid of `exec`, switch to `gh pr edit` --- .github/workflows/tag-more-reviewers.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tag-more-reviewers.yaml b/.github/workflows/tag-more-reviewers.yaml index f4233751cab61..f6ce74aac7c50 100644 --- a/.github/workflows/tag-more-reviewers.yaml +++ b/.github/workflows/tag-more-reviewers.yaml @@ -22,9 +22,5 @@ jobs: steps: - name: Tag Konflux Maintainers for review run: | - exec gh api \ - --method POST \ - -H "Accept: application/vnd.github+json" \ - -H "X-GitHub-Api-Version: 2022-11-28" \ - "/repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/requested_reviewers" \ - --input - <<< '{ "team_reviewers": [ "konflux-maintainers" ] }' + gh pr --repo "${{ github.repository }}" edit "${{ github.event.pull_request.number }}" \ + --add-reviewer stackrox/konflux-maintainers From 2d5bcee94ab0311e58655f2b023afc67478b3911 Mon Sep 17 00:00:00 2001 From: Misha Sugakov Date: Tue, 2 Dec 2025 19:26:12 +0100 Subject: [PATCH 4/4] Updated CODEOWNERS comment From https://github.com/stackrox/collector/pull/2693 --- .github/CODEOWNERS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 54d3bf6149886..6790fee17e86a 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -81,9 +81,9 @@ operator/**/* @stackrox/install /sensor/kubernetes/listener/resources/secrets* @stackrox/scanner /SCANNER_VERSION @stackrox/scanner -# The Konflux maintainers for ACS review all changes related to the Konflux pipelines, Dockerfiles, etc. -# Release engineers need to merge MintMaker PRs at the time of release. -# rhacs-bot needs ability to auto-approve MintMaker PRs for automated task and security updates. +# Konflux maintainers for ACS review all changes related to the Konflux pipelines, Dockerfiles, etc. +# Release engineers need to merge MintMaker PRs at the time of the release. +# rhacs-bot needs an ability to auto-approve MintMaker PRs for automated task and security updates. **/konflux.*Dockerfile @stackrox/konflux-maintainers-no-email @stackrox/release-mgmt-no-email @rhacs-bot /.tekton/ @stackrox/konflux-maintainers-no-email @stackrox/release-mgmt-no-email @rhacs-bot rpms.* @stackrox/konflux-maintainers-no-email @stackrox/release-mgmt-no-email @rhacs-bot