From e7b79e976957164370a6eded813c54f58535e92c Mon Sep 17 00:00:00 2001 From: Jathavedhan M Date: Wed, 10 Jun 2026 10:30:26 +0530 Subject: [PATCH] [manila-csi-plugin] Remove rules from aggregated ClusterRoles to avoid 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 --- charts/manila-csi-plugin/Chart.yaml | 2 +- .../templates/controllerplugin-clusterrole.yaml | 1 - charts/manila-csi-plugin/templates/nodeplugin-clusterrole.yaml | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/charts/manila-csi-plugin/Chart.yaml b/charts/manila-csi-plugin/Chart.yaml index e64f5c1901..03499bf7e9 100644 --- a/charts/manila-csi-plugin/Chart.yaml +++ b/charts/manila-csi-plugin/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: v1.36.0 description: Manila CSI Chart for OpenStack name: openstack-manila-csi -version: 2.36.0 +version: 2.36.1 home: http://github.com/kubernetes/cloud-provider-openstack icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png maintainers: diff --git a/charts/manila-csi-plugin/templates/controllerplugin-clusterrole.yaml b/charts/manila-csi-plugin/templates/controllerplugin-clusterrole.yaml index 75313f8063..2fd8107be8 100644 --- a/charts/manila-csi-plugin/templates/controllerplugin-clusterrole.yaml +++ b/charts/manila-csi-plugin/templates/controllerplugin-clusterrole.yaml @@ -8,4 +8,3 @@ aggregationRule: clusterRoleSelectors: - matchLabels: rbac.manila.csi.openstack.org/aggregate-to-controller-{{ include "openstack-manila-csi.name" . }}: "true" -rules: [] diff --git a/charts/manila-csi-plugin/templates/nodeplugin-clusterrole.yaml b/charts/manila-csi-plugin/templates/nodeplugin-clusterrole.yaml index f8261b83a6..9177142d5f 100644 --- a/charts/manila-csi-plugin/templates/nodeplugin-clusterrole.yaml +++ b/charts/manila-csi-plugin/templates/nodeplugin-clusterrole.yaml @@ -8,4 +8,3 @@ aggregationRule: clusterRoleSelectors: - matchLabels: rbac.manila.csi.openstack.org/aggregate-to-nodeplugin-{{ include "openstack-manila-csi.name" . }}: "true" -rules: []