Skip to content

[main] enable auto-merge for highs/crits + add auto-approve renovate PR job - #624

Merged
thatmidwesterncoder merged 3 commits into
rancher:masterfrom
thatmidwesterncoder:renovate_tweaks
Sep 21, 2026
Merged

thatmidwesterncoder merged 3 commits into
rancher:masterfrom
thatmidwesterncoder:renovate_tweaks

Conversation

@thatmidwesterncoder

Copy link
Copy Markdown

automerge snippet for renovate was yoinked from here: https://github.com/rancher/renovate-config/blob/main/automerge.json

essentially by importing that it would auto-approve everything - we are only doing auto-approve for security dependencies.

then just yoinked the auto-approve job from tim since it seemed pretty clean. we could always re-do this to be simpler and just auto-approve renovate bot PRs if automerge is enabled but this is battle tested over on fleet already.

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

🟡 Changes recommended

Auto-merge and auto-approval scope must be narrowed to the intended security-only policy.

Get a fresh assessment by requesting another Copilot review.

Pull request overview

Adds Renovate security auto-merge configuration and a workflow for automatically approving eligible Renovate pull requests.

Changes:

  • Adds scheduled/manual eligibility checks and GitHub App-based approvals.
  • Configures security-focused Renovate auto-merge rules.
File summaries
File Summary Findings
.github/workflows/auto-approve-bot-prs.yml Validates and approves eligible Renovate PRs. None noted.
.github/renovate.json Defines Renovate auto-merge rules and branch presets. Vulnerability matching is not limited to high/critical severity; release-branch presets can re-enable non-security auto-merge.
Review details

Suppressed comments (1)

.github/renovate.json:39

  • This branch-specific preset is expanded after the preceding local package rules, and the referenced release configuration extends automerge.json, which enables automerge for non-security patch/minor updates. Consequently, release-branch Renovate PRs can still have Automerge: Enabled and this workflow will approve them, contrary to the stated security-only policy. Re-assert the automerge: false catch-all after all branch-specific extends entries, or remove the non-security automerge preset from these branches.
      "extends": [
        "github>rancher/renovate-config//rancher-main#main"
      ]
  • Files reviewed: 2/2 changed files
  • Comments generated: 1
  • Review effort level: Lite

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Comment thread .github/renovate.json

@jiaqiluo jiaqiluo left a comment

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.

LGTM

@jiaqiluo
jiaqiluo requested a review from a team September 18, 2026 18:04
@thatmidwesterncoder
thatmidwesterncoder merged commit 84c981c into rancher:master Sep 21, 2026
1 check passed
@thatmidwesterncoder
thatmidwesterncoder deleted the renovate_tweaks branch September 21, 2026 15:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants