Exclude Konflux branches from branch protection for bpfman repos#77796
Exclude Konflux branches from branch protection for bpfman repos#77796frobware wants to merge 1 commit intoopenshift:mainfrom
Conversation
Konflux automation creates branches prefixed with konflux/ and konflux- for nudge PRs and dependency updates. When these branches are protected by Prow's branchprotector, Renovate cannot delete stale branches via pruneStaleBranches. This causes nudge PRs to accumulate hundreds of unrelated commits when the target release branch changes, as the automation reuses the old branch rooted on a previous release. Add exclude patterns for ^konflux- and ^konflux/ to bpfman, bpfman-operator, and bpfman-catalog, following the precedent set by oadp-operator, openshift-velero-plugin, hypershift-oadp-plugin, and oadp-must-gather. All other branches remain protected.
WalkthroughAdded or updated branch protection configurations across three bpfman repositories in the OpenShift organization, excluding branches matching Changes
Estimated code review effort🎯 1 (Trivial) | ⏱️ ~3 minutes 🚥 Pre-merge checks | ✅ 10✅ Passed checks (10 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
|
[REHEARSALNOTIFIER] Note: If this PR includes changes to step registry files ( |
|
@frobware: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
|
/lgtm |
|
@dfarrell07: changing LGTM is restricted to collaborators DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: dfarrell07, frobware The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Konflux automation creates branches prefixed with
konflux/andkonflux-for nudge PRs and dependency updates. When Prow's branchprotector marks these branches as protected, Renovate'spruneStaleBranchescannot delete them. This becomes a problem when the target release branch changes: the automation reuses the old branch (rooted on a previous release) rather than creating a fresh one, resulting in nudge PRs that carry hundreds of unrelated commits from the diverged history.This was observed on openshift/bpfman-operator where nudge PRs targeting
release-0.6appeared with 533 commits because the branches had originally been created againstrelease-0.5.8. The branches could not be deleted or force-pushed due to the protection rules, and resolving the merge conflicts discarded the actual nudge updates, making the PRs undeliverable.This change adds
excludepatterns for^konflux-and^konflux/to the branch protection configuration for openshift/bpfman, openshift/bpfman-operator, and openshift/bpfman-catalog. All other branches remain protected. This follows the approach already taken by oadp-operator, openshift-velero-plugin, hypershift-oadp-plugin, and oadp-must-gather.Slack discussion: https://redhat-internal.slack.com/archives/C04PZ7H0VA8/p1776172390760359
Summary by CodeRabbit