From e08494341b3d4ef77424dc6a1a8c83dc6fdee632 Mon Sep 17 00:00:00 2001
From: Dean Chen <862469039@qq.com>
Date: Sat, 12 Sep 2026 01:30:53 +0500
Subject: [PATCH] [manila-csi-plugin] drop rules from aggregated ClusterRoles

Helm 4 server-side apply claims .rules when the chart sets rules: [].
clusterrole-aggregation-controller already owns that field, so the next
upgrade conflicts. Leave rules unset and let the aggregator fill them in.

Signed-off-by: Dean Chen <862469039@qq.com>
---
 .../templates/controllerplugin-clusterrole.yaml                 | 2 +-
 charts/manila-csi-plugin/templates/nodeplugin-clusterrole.yaml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/manila-csi-plugin/templates/controllerplugin-clusterrole.yaml b/charts/manila-csi-plugin/templates/controllerplugin-clusterrole.yaml
index 75313f8063..01e24b585a 100644
--- a/charts/manila-csi-plugin/templates/controllerplugin-clusterrole.yaml
+++ b/charts/manila-csi-plugin/templates/controllerplugin-clusterrole.yaml
@@ -8,4 +8,4 @@ aggregationRule:
   clusterRoleSelectors:
     - matchLabels:
         rbac.manila.csi.openstack.org/aggregate-to-controller-{{ include "openstack-manila-csi.name" . }}: "true"
-rules: []
+{{- /* do not set rules: clusterrole-aggregation-controller owns that field; Helm SSA applying rules: [] conflicts on upgrade */}}
diff --git a/charts/manila-csi-plugin/templates/nodeplugin-clusterrole.yaml b/charts/manila-csi-plugin/templates/nodeplugin-clusterrole.yaml
index f8261b83a6..6028121fa6 100644
--- a/charts/manila-csi-plugin/templates/nodeplugin-clusterrole.yaml
+++ b/charts/manila-csi-plugin/templates/nodeplugin-clusterrole.yaml
@@ -8,4 +8,4 @@ aggregationRule:
   clusterRoleSelectors:
     - matchLabels:
         rbac.manila.csi.openstack.org/aggregate-to-nodeplugin-{{ include "openstack-manila-csi.name" . }}: "true"
-rules: []
+{{- /* do not set rules: clusterrole-aggregation-controller owns that field; Helm SSA applying rules: [] conflicts on upgrade */}}