Skip to content

[manila-csi-plugin] Remove rules from aggregated ClusterRoles to fix Helm v4 SSA conflict#3127

Open
carterpewpew wants to merge 1 commit into
kubernetes:masterfrom
carterpewpew:fix/manila-csi-ssa-aggregated-clusterroles
Open

[manila-csi-plugin] Remove rules from aggregated ClusterRoles to fix Helm v4 SSA conflict#3127
carterpewpew wants to merge 1 commit into
kubernetes:masterfrom
carterpewpew:fix/manila-csi-ssa-aggregated-clusterroles

Conversation

@carterpewpew

Copy link
Copy Markdown

What this PR does / why we need it:

When a ClusterRole uses aggregationRule, the clusterrole-aggregation-controller takes SSA ownership of the .rules field. The chart currently renders rules: [] on both the controllerplugin and nodeplugin aggregated ClusterRoles. With Helm v4 (which defaults to Server-Side Apply), this causes a field manager conflict on every helm upgrade after the initial install, because both Helm and the aggregation controller claim ownership of .rules. This PR removes the redundant rules: [] from both templates. The aggregation controller continues to populate the rules from the matching child ClusterRoles as before.

Which issue this PR fixes(if applicable):
fixes #3119

Special notes for reviewers:

Release note:

[manila-csi-plugin] Fixed Helm v4 upgrade failure caused by SSA conflict on aggregated ClusterRoles.

@k8s-ci-robot k8s-ci-robot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Jun 10, 2026
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 10, 2026
@k8s-ci-robot

Copy link
Copy Markdown
Contributor

Hi @carterpewpew. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work.

Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jun 10, 2026
@carterpewpew carterpewpew changed the title [manila-csi-plugin] Remove rules from aggregated ClusterRoles to avoi… [manila-csi-plugin] Remove rules from aggregated ClusterRoles to fix Helm v4 SSA conflict Jun 10, 2026
@gouthampacha

Copy link
Copy Markdown
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 19, 2026
@gouthampacha

Copy link
Copy Markdown
Contributor

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 19, 2026
@k8s-ci-robot

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: gouthampacha
Once this PR has been reviewed and has the lgtm label, please assign stephenfin for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

@gouthampacha

Copy link
Copy Markdown
Contributor

The lint CI failure is because ct lint requires a version bump when chart files change:

Old chart version: 2.36.0
New chart version: 2.36.0
✖︎ openstack-manila-csi => chart version not ok. Needs a version bump!

Please bump the version in charts/manila-csi-plugin/Chart.yaml (e.g. 2.36.02.36.1).

…d SSA conflicts

When a ClusterRole uses aggregationRule, the clusterrole-aggregation-controller
owns the .rules field. Explicitly setting `rules: []` in the Helm template
causes a field manager conflict with Helm v4's Server-Side Apply on upgrades.
Omit the field entirely so ownership is not contested.

Signed-off-by: Jathavedhan M <jathavedhan.m@ibm.com>
@carterpewpew carterpewpew force-pushed the fix/manila-csi-ssa-aggregated-clusterroles branch from 954f8ae to e7b79e9 Compare June 20, 2026 12:58
@kubernetes-prow kubernetes-prow Bot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 20, 2026
@kubernetes-prow

Copy link
Copy Markdown

New changes are detected. LGTM label has been removed.

@kubernetes-prow

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: gouthampacha
Once this PR has been reviewed and has the lgtm label, please assign stephenfin for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

@carterpewpew

Copy link
Copy Markdown
Author

The lint CI failure is because ct lint requires a version bump when chart files change:

Old chart version: 2.36.0
New chart version: 2.36.0
✖︎ openstack-manila-csi => chart version not ok. Needs a version bump!

Please bump the version in charts/manila-csi-plugin/Chart.yaml (e.g. 2.36.02.36.1).

Bumped the chart version to 2.36.1 in Chart.yaml to fix the ct lint failure. The CI should pass now. @gouthampacha PTAL. Thanks for taking a look again.

@gouthampacha

Copy link
Copy Markdown
Contributor

/retest-required

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. 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.

[manila-csi-plugin] Helm v4 upgrade fails on aggregated ClusterRoles due to SSA conflict on .rules

3 participants