Skip to content

ROSA-745: revert pilot fork renovate extends to openshift/boilerplate#289

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:masterfrom
MitaliBhalla:rosa-745/revert-fork-renovate-extends
Jun 9, 2026
Merged

ROSA-745: revert pilot fork renovate extends to openshift/boilerplate#289
openshift-merge-bot[bot] merged 1 commit into
openshift:masterfrom
MitaliBhalla:rosa-745/revert-fork-renovate-extends

Conversation

@MitaliBhalla

@MitaliBhalla MitaliBhalla commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

Summary

Reverts the #285 pilot change that pointed .github/renovate.json at MitaliBhalla/boilerplate#draft/rosa-745-gomod-batch-monday and restores the fleet-standard upstream extends:

"github>openshift/boilerplate//.github/renovate.json"

Unchanged: .github/dependabot.yml docker labels (lgtm/approved) and Mon 03:00 UTC schedule from #285.

Why

After merge

  • Before #748 merges: upstream renovate is tekton-only (same as pre-pilot production boilerplate).
  • After #748 merges: this repo picks up grouped gomod MintMaker rules automatically via extends (no fork).

Follow-up

  • Close stale Dependabot gomod PR #240 if still open.
  • Run boilerplate-update after #748 for standard.mk validate fix.

Test plan

  • renovate.json validates against upstream boilerplate extends
  • Dependency Dashboard updates after Konflux rescan
  • No dependency on MitaliBhalla/boilerplate fork branch

Related

Made with Cursor

Summary by CodeRabbit

  • Chores
    • Updated automated dependency management configuration to reference an alternate upstream source.

Revert the pilot fork extends (MitaliBhalla/boilerplate#draft/rosa-745-gomod-batch-monday)
so this repo inherits renovate config from openshift/boilerplate master like the rest
of the fleet. Dependabot docker labels/schedule from openshift#285 are unchanged.

After openshift/boilerplate#748 merges, gomod MintMaker rules apply via upstream extends.

Co-authored-by: Cursor <cursoragent@cursor.com>
@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 8, 2026
@openshift-ci-robot

openshift-ci-robot commented Jun 8, 2026

Copy link
Copy Markdown

@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

Reverts the #285 pilot change that pointed .github/renovate.json at MitaliBhalla/boilerplate#draft/rosa-745-gomod-batch-monday and restores the fleet-standard upstream extends:

"github>openshift/boilerplate//.github/renovate.json"

Unchanged: .github/dependabot.yml docker labels (lgtm/approved) and Mon 03:00 UTC schedule from #285.

Why

After merge

  • Before #748 merges: upstream renovate is tekton-only (same as pre-pilot production boilerplate).
  • After #748 merges: this repo picks up grouped gomod MintMaker rules automatically via extends (no fork).

Follow-up

  • Close stale Dependabot gomod PR #240 if still open.
  • Run boilerplate-update after #748 for standard.mk validate fix.

Test plan

  • renovate.json validates against upstream boilerplate extends
  • Dependency Dashboard updates after Konflux rescan
  • No dependency on MitaliBhalla/boilerplate fork branch

Related

Made with Cursor

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 8, 2026

Copy link
Copy Markdown

Walkthrough

This PR updates .github/renovate.json to extend the official OpenShift boilerplate Renovate configuration. The extends field switches from a draft branch reference to the published boilerplate repository configuration.

Changes

Renovate Config

Layer / File(s) Summary
Renovate extends configuration
.github/renovate.json
The extends list changes from github>MitaliBhalla/boilerplate#draft/... to github>openshift/boilerplate//.github/renovate.json, using the official upstream configuration.

Possibly Related PRs

  • openshift/ocm-agent-operator#285: Updates .github/renovate.json's extends setting; this PR restores the reference to the official openshift/boilerplate configuration after that temporary change.

Suggested Labels

approved, lgtm, jira/valid-reference

Suggested Reviewers

  • vaidehi411
  • xiaoyu74

Estimated Code Review Effort

🎯 1 (Trivial) | ⏱️ ~2 minutes

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly references the main change: reverting the renovate configuration extends from a pilot fork back to the upstream openshift/boilerplate standard.
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 All 87 Ginkgo test titles examined use static descriptive strings with no dynamic information like UUIDs, timestamps, generated suffixes, or node/namespace/IP addresses.
Test Structure And Quality ✅ Passed PR only modifies .github/renovate.json configuration; no test code changes present, so Ginkgo test quality check is not applicable.
Microshift Test Compatibility ✅ Passed PR only modifies .github/renovate.json (Renovate config); no Ginkgo e2e tests are added, so MicroShift test compatibility check does not apply.
Single Node Openshift (Sno) Test Compatibility ✅ Passed PR only modifies .github/renovate.json configuration file with no new Ginkgo e2e tests added, making SNO test compatibility check not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed Check does not apply: PR only modifies .github/renovate.json (tool config), not deployment manifests, operator code, or controllers with scheduling constraints.
Ote Binary Stdout Contract ✅ Passed PR changes only .github/renovate.json configuration file with no executable code, test code, or logging setup that could violate OTE stdout contract.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PR only modifies .github/renovate.json configuration; no Ginkgo e2e tests are added or modified, so IPv6/disconnected network test compatibility check does not apply.
No-Weak-Crypto ✅ Passed The PR only modifies .github/renovate.json, a configuration file with no code. It contains no cryptographic implementations, weak crypto usage, or secret comparisons.
Container-Privileges ✅ Passed PR only modifies .github/renovate.json, a Renovate dependency automation config. No container/K8s manifests or privilege escalation settings present.
No-Sensitive-Data-In-Logs ✅ Passed PR modifies only .github/renovate.json configuration file with no logging statements or exposed sensitive data (passwords, tokens, API keys, PII, etc.).
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.

✏️ 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 TheUndeadKing and bmeng June 8, 2026 07:45
@openshift-ci

openshift-ci Bot commented Jun 8, 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.

@MitaliBhalla

Copy link
Copy Markdown
Contributor Author

/retest

@devppratik

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 9, 2026
@tkong-redhat

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci

openshift-ci Bot commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: devppratik, MitaliBhalla, 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-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 9, 2026
@openshift-merge-bot openshift-merge-bot Bot merged commit b9f5419 into openshift:master Jun 9, 2026
10 checks passed
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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants