Skip to content

ROSA-745: branch-protection for addon-operator (Konflux + mandatory prow)#79947

Merged
openshift-merge-bot[bot] merged 2 commits into
openshift:mainfrom
MitaliBhalla:rosa-745-fedramp-konflux-branch-protection
Jun 3, 2026
Merged

ROSA-745: branch-protection for addon-operator (Konflux + mandatory prow)#79947
openshift-merge-bot[bot] merged 2 commits into
openshift:mainfrom
MitaliBhalla:rosa-745-fedramp-konflux-branch-protection

Conversation

@MitaliBhalla

@MitaliBhalla MitaliBhalla commented Jun 2, 2026

Copy link
Copy Markdown
Contributor

Summary

ROSA-745 branch-protection for FedRAMP addon-operator (main).

Konflux + mandatory prow (7 contexts). DPP: repo settings only.

Test plan

  • After merge, spot-check required Konflux + prow on a dependency PR

Summary by CodeRabbit

This PR establishes branch protection for the openshift/addon-operator repository's main branch as part of the ROSA-745 FedRAMP compliance initiative. The change adds a Prow configuration file that enforces required status checks before code can be merged.

What's protected:
The main branch of addon-operator now requires the following checks to pass before pull requests can merge:

  • Konflux build check: addon-operator-on-pull-request
  • Prow presubmit checks: coverage, images, lint, precommit-check, and unit

Practical impact:
Any PR to the addon-operator repository targeting the main branch must now pass both the Konflux build verification and all five mandatory Prow presubmit jobs before it can be merged. This ensures code quality and compliance requirements are met through both build and test infrastructure.

The configuration is limited to branch-protection rules and tide query settings, with no changes to the job definitions themselves.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 2, 2026
@openshift-ci-robot

openshift-ci-robot commented Jun 2, 2026

Copy link
Copy Markdown
Contributor

@MitaliBhalla: This pull request references ROSA-745 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the initiative to target the "5.0.0" version, but no target version was set.

Details

In response to this:

Summary

ROSA-745: require Konflux on-pull-request for FedRAMP repo addon-operator (main).

Test plan

  • After merge, branch-protector reconciles (~6h)
  • Spot-check one PR: Konflux kflux-prd-rh03 / addon-operator-on-pull-request required

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 openshift-eng/jira-lifecycle-plugin repository.

@coderabbitai

coderabbitai Bot commented Jun 2, 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: ec044b2b-c501-4126-b3ff-135c704b562f

📥 Commits

Reviewing files that changed from the base of the PR and between e5ea8ae and 30602b8.

📒 Files selected for processing (1)
  • core-services/prow/02_config/openshift/addon-operator/_prowconfig.yaml

Walkthrough

Adds a branch-protection section to the Prow config for openshift/addon-operator, protecting the main branch and requiring a set of status-check contexts (Konflux and multiple ci/prow/* checks).

Changes

Branch Protection for addon-operator

Layer / File(s) Summary
Branch protection configuration
core-services/prow/02_config/openshift/addon-operator/_prowconfig.yaml
Adds a branch-protection block protecting main and listing required-status-checks: Konflux kflux-prd-rh03 / addon-operator-on-pull-request plus ci/prow/coverage, ci/prow/images, ci/prow/lint, ci/prow/precommit-check, and ci/prow/unit.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Suggested reviewers

  • clcollins
  • joshbranham
🚥 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 clearly and specifically references ROSA-745 and accurately describes the main change: adding branch-protection configuration for addon-operator with both Konflux and mandatory Prow checks enabled.
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 modifies only Prow configuration YAML (branch-protection and tide settings), not Ginkgo test files. Check for stable test names is not applicable.
Test Structure And Quality ✅ Passed PR only modifies Prow CI configuration YAML file, not Ginkgo test code. Check for test structure and quality is not applicable to configuration-only changes.
Microshift Test Compatibility ✅ Passed No Ginkgo e2e tests are added in this PR. The PR only modifies a Prow CI configuration YAML file for branch-protection and tide settings. The check is not applicable.
Single Node Openshift (Sno) Test Compatibility ✅ Passed This PR adds only Prow branch-protection and tide configuration in YAML format. No Ginkgo e2e tests are added, so the SNO test compatibility check does not apply.
Topology-Aware Scheduling Compatibility ✅ Passed PR modifies only Prow CI/CD configuration for branch protection and merge automation, not deployment manifests, operator code, or controllers—check not applicable.
Ote Binary Stdout Contract ✅ Passed PR contains only YAML configuration changes to Prow settings. OTE Binary Stdout Contract check is inapplicable to configuration-only changes with no test code.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PR does not add any Ginkgo e2e tests; it only modifies Prow branch-protection and tide YAML configuration for the addon-operator repository. Check is not applicable.
No-Weak-Crypto ✅ Passed PR modifies only YAML CI configuration file with no cryptographic code, implementations, or weak crypto algorithm usage present.
Container-Privileges ✅ Passed PR modifies a Prow CI/CD config file with branch-protection and tide settings, not a container/K8s manifest. No privileged specs found.
No-Sensitive-Data-In-Logs ✅ Passed The PR adds only YAML configuration for Prow branch protection and tide settings. No logging statements or sensitive data (passwords, tokens, API keys, PII, etc.) are present in the file.

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

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

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

@openshift-ci openshift-ci Bot requested review from Ajpantuso and ashishmax31 June 2, 2026 04:32
@openshift-merge-bot openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Jun 2, 2026
Require primary Konflux on-pull-request and mandatory ci/prow/* presubmits
(non-optional only; derived from ci-operator presubmits + DPP-20685 list).

Repo settings (auto-merge, merge commits) remain DPP.

Repos: addon-operator
@MitaliBhalla MitaliBhalla force-pushed the rosa-745-fedramp-konflux-branch-protection branch from e5ea8ae to 9128ecb Compare June 2, 2026 04:38
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@MitaliBhalla: pj-rehearse could not automatically process this event because the request waited in queue for longer than 5 minutes. Use /pj-rehearse to trigger rehearsals manually.

@MitaliBhalla MitaliBhalla changed the title ROSA-745: Konflux branch-protection (fedramp) ROSA-745: branch-protection for addon-operator (Konflux + mandatory prow) Jun 2, 2026
@MitaliBhalla

MitaliBhalla commented Jun 2, 2026

Copy link
Copy Markdown
Contributor Author

Branch protection layout (ROSA-745)

Supplemental _prowconfig.yaml only allows branch-protection and tide.queries (not tide.context_options).

Layer What is required
branch-protection Konflux *-on-pull-request + mandatory prow that are always-run on main (ci-index, coverage, images, lint, precommit-check, unit)
tide (_config.yaml) No extra required-if-present-contexts (all mandatory prow presubmits are always-run)

Dependency PRs must pass prow/Konflux when those jobs run.

@pheckenlWork

Copy link
Copy Markdown

The FedRAMP team has looked at this PR, and we don't have any concerns.

required_status_checks:
contexts:
- Konflux kflux-prd-rh03 / addon-operator-on-pull-request
- ci/prow/ci-index-addon-operator-bundle

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is not needed anymore since addon-operator is deployed via package-operator packages.

addon-operator is deployed via package-operator packages; the OLM bundle
index presubmit is not needed as a branch-protection gate (erdii review).

Co-authored-by: Cursor <cursoragent@cursor.com>
@MitaliBhalla

Copy link
Copy Markdown
Contributor Author

Thanks @erdii — dropped ci/prow/ci-index-addon-operator-bundle from required contexts for addon-operator in 30602b8. Kept Konflux addon-operator-on-pull-request plus coverage/images/lint/precommit-check/unit.

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@MitaliBhalla: 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 3, 2026

Copy link
Copy Markdown
Contributor

@MitaliBhalla: 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.

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

openshift-ci Bot commented Jun 3, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: MitaliBhalla, psalajova

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-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 3, 2026
@openshift-merge-bot openshift-merge-bot Bot merged commit 5994c08 into openshift:main Jun 3, 2026
12 checks passed
@openshift-ci

openshift-ci Bot commented Jun 3, 2026

Copy link
Copy Markdown
Contributor

@MitaliBhalla: 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-addon-operator-_prowconfig.yaml using file core-services/prow/02_config/openshift/addon-operator/_prowconfig.yaml
  • config configmap in namespace ci at cluster core-ci using the following files:
    • key core-services-prow-02_config-openshift-addon-operator-_prowconfig.yaml using file core-services/prow/02_config/openshift/addon-operator/_prowconfig.yaml
Details

In response to this:

Summary

ROSA-745 branch-protection for FedRAMP addon-operator (main).

Konflux + mandatory prow (7 contexts). DPP: repo settings only.

Test plan

  • After merge, spot-check required Konflux + prow on a dependency PR

Summary by CodeRabbit

This PR establishes branch protection for the openshift/addon-operator repository's main branch as part of the ROSA-745 FedRAMP compliance initiative. The change adds a Prow configuration file that enforces required status checks before code can be merged.

What's protected:
The main branch of addon-operator now requires the following checks to pass before pull requests can merge:

  • Konflux build check: addon-operator-on-pull-request
  • Prow presubmit checks: coverage, images, lint, precommit-check, and unit

Practical impact:
Any PR to the addon-operator repository targeting the main branch must now pass both the Konflux build verification and all five mandatory Prow presubmit jobs before it can be merged. This ensures code quality and compliance requirements are met through both build and test infrastructure.

The configuration is limited to branch-protection rules and tide query settings, with no changes to the job definitions themselves.

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.

IshwarKanse pushed a commit to IshwarKanse/release that referenced this pull request Jun 4, 2026
…row) (openshift#79947)

* ROSA-745: branch-protection for fedramp (Konflux + mandatory prow)

Require primary Konflux on-pull-request and mandatory ci/prow/* presubmits
(non-optional only; derived from ci-operator presubmits + DPP-20685 list).

Repo settings (auto-merge, merge commits) remain DPP.

Repos: addon-operator

* ROSA-745: drop ci-index-addon-operator-bundle from required checks

addon-operator is deployed via package-operator packages; the OLM bundle
index presubmit is not needed as a branch-protection gate (erdii review).

Co-authored-by: Cursor <cursoragent@cursor.com>

---------

Co-authored-by: Cursor <cursoragent@cursor.com>
fracappa pushed a commit to fracappa/release that referenced this pull request Jun 4, 2026
…row) (openshift#79947)

* ROSA-745: branch-protection for fedramp (Konflux + mandatory prow)

Require primary Konflux on-pull-request and mandatory ci/prow/* presubmits
(non-optional only; derived from ci-operator presubmits + DPP-20685 list).

Repo settings (auto-merge, merge commits) remain DPP.

Repos: addon-operator

* ROSA-745: drop ci-index-addon-operator-bundle from required checks

addon-operator is deployed via package-operator packages; the OLM bundle
index presubmit is not needed as a branch-protection gate (erdii review).

Co-authored-by: Cursor <cursoragent@cursor.com>

---------

Co-authored-by: Cursor <cursoragent@cursor.com>
TimurMP pushed a commit to TimurMP/release that referenced this pull request Jun 4, 2026
…row) (openshift#79947)

* ROSA-745: branch-protection for fedramp (Konflux + mandatory prow)

Require primary Konflux on-pull-request and mandatory ci/prow/* presubmits
(non-optional only; derived from ci-operator presubmits + DPP-20685 list).

Repo settings (auto-merge, merge commits) remain DPP.

Repos: addon-operator

* ROSA-745: drop ci-index-addon-operator-bundle from required checks

addon-operator is deployed via package-operator packages; the OLM bundle
index presubmit is not needed as a branch-protection gate (erdii review).

Co-authored-by: Cursor <cursoragent@cursor.com>

---------

Co-authored-by: Cursor <cursoragent@cursor.com>
krisnababu pushed a commit to oharan2/release that referenced this pull request Jul 3, 2026
…row) (openshift#79947)

* ROSA-745: branch-protection for fedramp (Konflux + mandatory prow)

Require primary Konflux on-pull-request and mandatory ci/prow/* presubmits
(non-optional only; derived from ci-operator presubmits + DPP-20685 list).

Repo settings (auto-merge, merge commits) remain DPP.

Repos: addon-operator

* ROSA-745: drop ci-index-addon-operator-bundle from required checks

addon-operator is deployed via package-operator packages; the OLM bundle
index presubmit is not needed as a branch-protection gate (erdii review).

Co-authored-by: Cursor <cursoragent@cursor.com>

---------

Co-authored-by: Cursor <cursoragent@cursor.com>
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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. 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.

5 participants