Skip to content

KFLUXSPRT-8235: disable Renovate automerge for Tide-managed MintMaker PRs#587

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:masterfrom
MitaliBhalla:kfluxsprt-8235-tide-automerge
Jul 1, 2026
Merged

KFLUXSPRT-8235: disable Renovate automerge for Tide-managed MintMaker PRs#587
openshift-merge-bot[bot] merged 1 commit into
openshift:masterfrom
MitaliBhalla:kfluxsprt-8235-tide-automerge

Conversation

@MitaliBhalla

@MitaliBhalla MitaliBhalla commented Jul 1, 2026

Copy link
Copy Markdown
Contributor

Summary

Pilot fix for KFLUXSPRT-8235 on managed-cluster-validating-webhooks (first ROSA operator test repo per MintMaker thread).

MintMaker guidance for Prow/Tide-integrated GitHub repos: set automerge: false (and do not use platform automerge). Safe dependency PRs should get lgtm + approved labels and let Tide merge once mandatory ci/prow/* + Konflux *-on-pull-request checks pass.

This adds a repo-local packageRules override on top of boilerplate renovate.json:

  • gomod + tekton patch/minor/pin/digest → automerge: false, platformAutomerge: false, addLabels: [lgtm, approved]
  • Major updates unchanged (still manual via boilerplate rules)

Supersedes #555 (boilerplate-update / enabledManagers — already on master via extends).

Context

  • Premature Konflux bot merges with red e2e / missing prow were traced to platform automerge racing Tide
  • Separate fleet issue: go.sum / artifact failures on grouped gomod PRs need repo-owner dep fixes (not this PR)
  • Konflux task-git-clone-oci-ta 0.2 / acceptable bundles (KFLUXSPRT-8263) may keep some MintMaker PRs red until platform fixes land — validation of Tide merge should wait for green CI

Test plan

  • Merge this config PR (prow + Konflux green)
  • Next MintMaker patch/minor gomod or tekton PR: has lgtm + approved, no Renovate/platform automerge
  • PR merges via Tide only after all required checks green
  • Major MintMaker PR still opens without lgtm/approved — manual /lgtm required
  • If successful, roll same override pattern fleet-wide (and follow-up boilerplate change)

References

Made with Cursor

Summary by CodeRabbit

  • Chores
    • Updated dependency update automation to apply consistent labels for certain Go and Tekton updates.
    • Disabled automatic merging for minor, patch, pin, and digest updates in those categories, requiring manual review before merge.

… PRs

Override boilerplate renovate rules so patch/minor gomod and tekton updates
get lgtm/approved labels only; Tide merges after Prow + Konflux pass.
Per MintMaker team guidance for Prow-integrated repos.

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 Jul 1, 2026
@openshift-ci-robot

openshift-ci-robot commented Jul 1, 2026

Copy link
Copy Markdown

@MitaliBhalla: This pull request references KFLUXSPRT-8235 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 task to target the "5.0.0" version, but no target version was set.

Details

In response to this:

Summary

Pilot fix for KFLUXSPRT-8235 on managed-cluster-validating-webhooks (first ROSA operator test repo per MintMaker thread).

MintMaker guidance for Prow/Tide-integrated GitHub repos: set automerge: false (and do not use platform automerge). Safe dependency PRs should get lgtm + approved labels and let Tide merge once mandatory ci/prow/* + Konflux *-on-pull-request checks pass.

This adds a repo-local packageRules override on top of boilerplate renovate.json:

  • gomod + tekton patch/minor/pin/digest → automerge: false, platformAutomerge: false, addLabels: [lgtm, approved]
  • Major updates unchanged (still manual via boilerplate rules)

Supersedes #555 (boilerplate-update / enabledManagers — already on master via extends).

Context

  • Premature Konflux bot merges with red e2e / missing prow were traced to platform automerge racing Tide
  • Separate fleet issue: go.sum / artifact failures on grouped gomod PRs need repo-owner dep fixes (not this PR)
  • Konflux task-git-clone-oci-ta 0.2 / acceptable bundles (KFLUXSPRT-8263) may keep some MintMaker PRs red until platform fixes land — validation of Tide merge should wait for green CI

Test plan

  • Merge this config PR (prow + Konflux green)
  • Next MintMaker patch/minor gomod or tekton PR: has lgtm + approved, no Renovate/platform automerge
  • PR merges via Tide only after all required checks green
  • Major MintMaker PR still opens without lgtm/approved — manual /lgtm required
  • If successful, roll same override pattern fleet-wide (and follow-up boilerplate change)

References

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 Jul 1, 2026

Copy link
Copy Markdown

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: e79016dc-8e34-4578-9f1a-89eef72fd8c2

📥 Commits

Reviewing files that changed from the base of the PR and between a21d1a0 and 6d6e8be.

📒 Files selected for processing (1)
  • .github/renovate.json

Walkthrough

A new Renovate packageRules entry is added to .github/renovate.json that targets gomod and tekton managers for minor, patch, pin, and digest update types, disabling automerge and platformAutomerge while applying lgtm and approved labels.

Changes

Renovate Configuration Update

Layer / File(s) Summary
Add packageRules entry
.github/renovate.json
New rule for gomod/tekton managers disables automerge and platformAutomerge for minor/patch/pin/digest updates and adds lgtm/approved labels.

Estimated code review effort: 1 (Trivial) | ~2 minutes

🚥 Pre-merge checks | ✅ 14 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Single Node Openshift (Sno) Test Compatibility ⚠️ Warning test/e2e/validation_webhook_tests.go assumes infra/master nodes exist and schedules to them, with no SNO skip guard. Add a SingleReplicaTopology skip (label or runtime check) around the affected e2e specs, or rewrite them to avoid node-role assumptions.
✅ Passed checks (14 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title captures the main change: disabling Renovate automerge for Tide-managed PRs tied to KFLUXSPRT-8235.
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 changes .github/renovate.json; no Ginkgo test titles were added or modified, so the stable-name check is not applicable.
Test Structure And Quality ✅ Passed PR only changes .github/renovate.json; no Ginkgo tests or test setup/wait/assertion code were touched.
Microshift Test Compatibility ✅ Passed Only .github/renovate.json changed; no Ginkgo e2e tests or OpenShift API usage were added.
Topology-Aware Scheduling Compatibility ✅ Passed PASS: The PR only updates .github/renovate.json; no deployment manifests, controllers, or scheduling-related code were changed.
Ote Binary Stdout Contract ✅ Passed PR only changes .github/renovate.json; no process-level code or stdout-writing entrypoints were modified.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed Only .github/renovate.json changed; no Go/e2e test additions or network-related code were touched.
No-Weak-Crypto ✅ Passed The only touched file is .github/renovate.json, and it contains only Renovate rules—no MD5/SHA1/DES/RC4/3DES/Blowfish/ECB, custom crypto, or secret comparisons.
Container-Privileges ✅ Passed Only .github/renovate.json changed; no Kubernetes/container manifests or privilege-related settings were added.
No-Sensitive-Data-In-Logs ✅ Passed The PR only changes Renovate config; it adds no logging code or sensitive-data output, and the edited file contains no secrets or PII.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

@openshift-ci openshift-ci Bot requested review from aliceh and diakovnec July 1, 2026 04:30
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 1, 2026
@openshift-ci

openshift-ci Bot commented Jul 1, 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.

@smarthall

Copy link
Copy Markdown
Member

/lgtm

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

openshift-ci Bot commented Jul 1, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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:
  • OWNERS [MitaliBhalla,smarthall]

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 openshift-merge-bot Bot merged commit 9225608 into openshift:master Jul 1, 2026
9 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.

3 participants