Skip to content

Add strict protection for hulk managed operators #81052

Merged
openshift-merge-bot[bot] merged 2 commits into
openshift:mainfrom
tkong-redhat:strict-protection
Jun 25, 2026
Merged

Add strict protection for hulk managed operators #81052
openshift-merge-bot[bot] merged 2 commits into
openshift:mainfrom
tkong-redhat:strict-protection

Conversation

@tkong-redhat

@tkong-redhat tkong-redhat commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

Add strict protection for hulk managed operators in prow to minimize the auto-merge impact.
Currently only check image build then it will merge which brings a lot of trouble.

Summary by CodeRabbit

Updated OpenShift Prow branch-protection configuration to make auto-merge for hulk-managed operator repositories stricter. For the following repos/branches, merges now require additional required Prow status checks (beyond Konflux PR checks and image builds), including ci/prow/coverage, ci/prow/lint, ci/prow/test, ci/prow/validate, and ci/prow/e2e-binary-build-success: openshift/certman-operator (master), openshift/managed-node-metadata-operator (main), openshift/managed-upgrade-operator (master), and openshift/ocm-agent (master). Also added/expanded a new protected branch rule for openshift/ocm-agent-operator (master) to enforce the same expanded set of required checks, reducing the likelihood of merging changes without full validation and successful end-to-end build signals.

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 25, 2026
@coderabbitai

coderabbitai Bot commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 6a82d4c8-208b-417a-99cd-613aef68fec2

📥 Commits

Reviewing files that changed from the base of the PR and between 0ce4941 and 7d9f74a.

📒 Files selected for processing (5)
  • core-services/prow/02_config/openshift/certman-operator/_prowconfig.yaml
  • core-services/prow/02_config/openshift/managed-node-metadata-operator/_prowconfig.yaml
  • core-services/prow/02_config/openshift/managed-upgrade-operator/_prowconfig.yaml
  • core-services/prow/02_config/openshift/ocm-agent-operator/_prowconfig.yaml
  • core-services/prow/02_config/openshift/ocm-agent/_prowconfig.yaml

Walkthrough

The Prow branch-protection configs now require additional CI status checks for several OpenShift operator repositories, and openshift/ocm-agent-operator gains a new protected master branch rule.

Changes

Prow branch protection updates

Layer / File(s) Summary
Expand required status checks
core-services/prow/02_config/openshift/certman-operator/_prowconfig.yaml, core-services/prow/02_config/openshift/managed-node-metadata-operator/_prowconfig.yaml, core-services/prow/02_config/openshift/managed-upgrade-operator/_prowconfig.yaml, core-services/prow/02_config/openshift/ocm-agent/_prowconfig.yaml
Existing master branch-protection rules add ci/prow/coverage, ci/prow/lint, ci/prow/test, ci/prow/validate, and ci/prow/e2e-binary-build-success; openshift/ocm-agent adds only ci/prow/e2e-binary-build-success.
Add ocm-agent-operator protection rule
core-services/prow/02_config/openshift/ocm-agent-operator/_prowconfig.yaml
A new master branch-protection block is added with protection enabled and required Konflux plus Prow status contexts.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Possibly related PRs

Suggested labels

lgtm

Suggested reviewers

  • samanthajayasinghe
  • smarthall
  • patjlm
🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately summarizes the main change: stricter Prow branch protection for hulk-managed operators.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed PR only edits prow branch-protection YAML; no Ginkgo test files or test titles were changed.
Test Structure And Quality ✅ Passed PR only changes prow branch-protection YAMLs; no Ginkgo test code was added or modified, so this check is not applicable.
Microshift Test Compatibility ✅ Passed Only Prow branch-protection YAML changed; no Ginkgo test files or test bodies were added, so MicroShift compatibility is not implicated.
Single Node Openshift (Sno) Test Compatibility ✅ Passed PR only changes Prow branch-protection YAML; no new/modified Ginkgo e2e tests or SNO-unsafe test code were added.
Topology-Aware Scheduling Compatibility ✅ Passed The PR only updates prow branch-protection YAML; no deployment manifests, operator code, or controllers were changed, so no scheduling constraints were introduced.
Ote Binary Stdout Contract ✅ Passed PR only updates Prow branch-protection YAMLs; no binary/test setup code or stdout-writing paths were changed, so the OTE stdout contract is unaffected.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed Only prow branch-protection YAML was changed; no new Ginkgo e2e tests or network code were added, so no IPv4/disconnected risks to flag.
No-Weak-Crypto ✅ Passed Touched files only add Prow branch-protection contexts; no weak-crypto, custom crypto, or secret/token comparison code found.
Container-Privileges ✅ Passed Only Prow branch-protection YAML was changed; no K8s/container privilege fields appear in the touched files.
No-Sensitive-Data-In-Logs ✅ Passed Touched files only add required-status contexts in prow YAML; no log statements or sensitive data patterns were present.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@openshift-merge-bot openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Jun 25, 2026

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@core-services/prow/02_config/openshift/ocm-agent-operator/_prowconfig.yaml`:
- Line 5: The Tide/branch-protection repo key is mismatched: the config
currently targets ocm-agent while this prow config is for
openshift/ocm-agent-operator. Update the branch-protection target in the
_prowconfig.yaml config so it matches the repo used by Tide, and verify the
repository key is consistent across the affected branch protection and Tide
settings.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: a3199391-0761-4f71-a571-aa9db5ab2fe9

📥 Commits

Reviewing files that changed from the base of the PR and between db1fa5d and 0ce4941.

📒 Files selected for processing (4)
  • core-services/prow/02_config/openshift/certman-operator/_prowconfig.yaml
  • core-services/prow/02_config/openshift/managed-node-metadata-operator/_prowconfig.yaml
  • core-services/prow/02_config/openshift/managed-upgrade-operator/_prowconfig.yaml
  • core-services/prow/02_config/openshift/ocm-agent-operator/_prowconfig.yaml

Comment thread core-services/prow/02_config/openshift/ocm-agent-operator/_prowconfig.yaml Outdated
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@tkong-redhat: no rehearsable tests are affected by this change

Note: If this PR includes changes to step registry files (ci-operator/step-registry/) and you expected jobs to be found, try rebasing your PR onto the base branch. This helps pj-rehearse accurately detect changes when the base branch has moved forward.

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@openshift-ci

openshift-ci Bot commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

@tkong-redhat: all tests passed!

Full PR test history. Your PR dashboard.

Details

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. I understand the commands that are listed here.

@TheUndeadKing

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jun 25, 2026
@TheUndeadKing

Copy link
Copy Markdown
Contributor

/pj-rehearse ack

@openshift-ci

openshift-ci Bot commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: TheUndeadKing, tkong-redhat

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@TheUndeadKing: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-merge-bot openshift-merge-bot Bot merged commit f635a78 into openshift:main Jun 25, 2026
12 checks passed
@openshift-ci

openshift-ci Bot commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

@tkong-redhat: Updated the following 2 configmaps:

  • config configmap in namespace ci at cluster app.ci using the following files:
    • key core-services-prow-02_config-openshift-certman-operator-_prowconfig.yaml using file core-services/prow/02_config/openshift/certman-operator/_prowconfig.yaml
    • key core-services-prow-02_config-openshift-managed-node-metadata-operator-_prowconfig.yaml using file core-services/prow/02_config/openshift/managed-node-metadata-operator/_prowconfig.yaml
    • key core-services-prow-02_config-openshift-managed-upgrade-operator-_prowconfig.yaml using file core-services/prow/02_config/openshift/managed-upgrade-operator/_prowconfig.yaml
    • key core-services-prow-02_config-openshift-ocm-agent-operator-_prowconfig.yaml using file core-services/prow/02_config/openshift/ocm-agent-operator/_prowconfig.yaml
    • key core-services-prow-02_config-openshift-ocm-agent-_prowconfig.yaml using file core-services/prow/02_config/openshift/ocm-agent/_prowconfig.yaml
  • config configmap in namespace ci at cluster core-ci using the following files:
    • key core-services-prow-02_config-openshift-certman-operator-_prowconfig.yaml using file core-services/prow/02_config/openshift/certman-operator/_prowconfig.yaml
    • key core-services-prow-02_config-openshift-managed-node-metadata-operator-_prowconfig.yaml using file core-services/prow/02_config/openshift/managed-node-metadata-operator/_prowconfig.yaml
    • key core-services-prow-02_config-openshift-managed-upgrade-operator-_prowconfig.yaml using file core-services/prow/02_config/openshift/managed-upgrade-operator/_prowconfig.yaml
    • key core-services-prow-02_config-openshift-ocm-agent-operator-_prowconfig.yaml using file core-services/prow/02_config/openshift/ocm-agent-operator/_prowconfig.yaml
    • key core-services-prow-02_config-openshift-ocm-agent-_prowconfig.yaml using file core-services/prow/02_config/openshift/ocm-agent/_prowconfig.yaml
Details

In response to this:

Add strict protection for hulk managed operators in prow to minimize the auto-merge impact.
Currently only check image build then it will merge which brings a lot of trouble.

Summary by CodeRabbit

Updated OpenShift Prow branch-protection configuration to make auto-merge for hulk-managed operator repositories stricter. For the following repos/branches, merges now require additional required Prow status checks (beyond Konflux PR checks and image builds), including ci/prow/coverage, ci/prow/lint, ci/prow/test, ci/prow/validate, and ci/prow/e2e-binary-build-success: openshift/certman-operator (master), openshift/managed-node-metadata-operator (main), openshift/managed-upgrade-operator (master), and openshift/ocm-agent (master). Also added/expanded a new protected branch rule for openshift/ocm-agent-operator (master) to enforce the same expanded set of required checks, reducing the likelihood of merging changes without full validation and successful end-to-end build signals.

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.

kasturinarra pushed a commit to kasturinarra/release that referenced this pull request Jun 26, 2026
* Add strict protection for hulk managed operators in prow to minimize the auto-merge impact

* Add validate and e2e-build-success condition
@tkong-redhat tkong-redhat deleted the strict-protection branch July 2, 2026 06:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. rehearsals-ack Signifies that rehearsal jobs have been acknowledged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants