Skip to content

Fix Helm upgrade conflict on aggregated ClusterRoles#2286

Merged
knative-prow[bot] merged 1 commit intoknative:mainfrom
kahirokunn:fix-helm-ssa-aggregated-clusterroles-2283
Apr 29, 2026
Merged

Fix Helm upgrade conflict on aggregated ClusterRoles#2286
knative-prow[bot] merged 1 commit intoknative:mainfrom
kahirokunn:fix-helm-ssa-aggregated-clusterroles-2283

Conversation

@kahirokunn
Copy link
Copy Markdown
Member

Fixes #2283

Proposed Changes

  • Stop rendering rules: [] for the Helm chart's aggregated ClusterRole resources.
  • Leave the aggregated ClusterRole resources themselves managed by Helm so upgrades do not delete them.

Release Note

Fixed Helm upgrades failing with server-side apply conflicts on aggregated ClusterRoles.

Signed-off-by: kahirokunn <okinakahiro@gmail.com>
@knative-prow knative-prow Bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Apr 29, 2026
@knative-prow knative-prow Bot requested review from houshengbo and matzew April 29, 2026 04:41
@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 29, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 63.84%. Comparing base (641e806) to head (6a75515).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #2286   +/-   ##
=======================================
  Coverage   63.84%   63.84%           
=======================================
  Files          55       55           
  Lines        2478     2478           
=======================================
  Hits         1582     1582           
  Misses        777      777           
  Partials      119      119           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@houshengbo
Copy link
Copy Markdown
Contributor

/lgtm
/approve

@knative-prow knative-prow Bot added the lgtm Indicates that a PR is ready to be merged. label Apr 29, 2026
@knative-prow
Copy link
Copy Markdown

knative-prow Bot commented Apr 29, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: houshengbo, kahirokunn

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

@knative-prow knative-prow Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 29, 2026
@knative-prow knative-prow Bot merged commit e25204f into knative:main Apr 29, 2026
22 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. lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Apply failed with 1 conflict: conflict with "clusterrole-aggregation-controller": .rules"

2 participants