From 6221593a8ed9b8a1f7e4124b5e4f5d1f5f7a343a Mon Sep 17 00:00:00 2001
From: ci-bot <ci-bot@kubesphere.io>
Date: Thu, 14 Mar 2024 15:01:22 +0000
Subject: [PATCH] update ks-core helm chart

---
 src/test/ks-core/templates/builtinroles.yaml | 7 -------
 src/test/ks-core/templates/clusterroles.yaml | 6 ++----
 src/test/ks-core/templates/globalroles.yaml  | 4 +---
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/test/ks-core/templates/builtinroles.yaml b/src/test/ks-core/templates/builtinroles.yaml
index 2bb48b65b..e14db6a72 100644
--- a/src/test/ks-core/templates/builtinroles.yaml
+++ b/src/test/ks-core/templates/builtinroles.yaml
@@ -19,7 +19,6 @@ role:
     annotations:
       kubesphere.io/creator: system
       kubesphere.io/description: '{"zh": "管理项目中的所有资源。", "en": "Manage all resources in the project."}'
-    labels:
       iam.kubesphere.io/auto-aggregate: "true"
     name: admin
   rules:
@@ -53,7 +52,6 @@ role:
     annotations:
       kubesphere.io/creator: system
       kubesphere.io/description: '{"zh": "管理项目中除用户和角色之外的资源。", "en": "Manage resources other than users and roles in the project."}'
-    labels:
       iam.kubesphere.io/auto-aggregate: "true"
     name: operator
   rules:
@@ -107,7 +105,6 @@ role:
     annotations:
       kubesphere.io/creator: system
       kubesphere.io/description: '{"zh": "查看项目中的所有资源。", "en": "View all resources in the project."}'
-    labels:
       iam.kubesphere.io/auto-aggregate: "true"
     name: viewer
   rules:
@@ -150,7 +147,6 @@ role:
     annotations:
       kubesphere.io/creator: system
       kubesphere.io/description: '{"zh": "管理企业空间中的所有资源。", "en": "Manage all resources in the workspace."}'
-    labels:
       iam.kubesphere.io/auto-aggregate: "true"
     name: admin
   rules:
@@ -183,7 +179,6 @@ role:
     annotations:
       kubesphere.io/creator: system
       kubesphere.io/description: '{"zh": "查看企业空间设置。", "en": "View workspace settings."}'
-    labels:
       iam.kubesphere.io/auto-aggregate: "true"
     name: regular
   rules:
@@ -219,7 +214,6 @@ role:
     annotations:
       kubesphere.io/creator: system
       kubesphere.io/description: '{"zh": "查看企业设置、创建项目。", "en": "View workspace settings, create projects."}'
-    labels:
       iam.kubesphere.io/auto-aggregate: "true"
     name: self-provisioner
   rules: []
@@ -249,7 +243,6 @@ role:
     annotations:
       kubesphere.io/creator: system
       kubesphere.io/description: '{"zh": "查看企业空间中的所有资源。", "en": "View all resources in the workspace."}'
-    labels:
       iam.kubesphere.io/auto-aggregate: "true"
     name: viewer
   rules:
diff --git a/src/test/ks-core/templates/clusterroles.yaml b/src/test/ks-core/templates/clusterroles.yaml
index 109ddb048..5aa0a707f 100644
--- a/src/test/ks-core/templates/clusterroles.yaml
+++ b/src/test/ks-core/templates/clusterroles.yaml
@@ -4,9 +4,8 @@ metadata:
   annotations:
     kubesphere.io/creator: system
     kubesphere.io/description: '{"zh": "管理集群中的所有资源。", "en": "Manage all resources in the cluster."}'
-  name: cluster-admin
-  labels:
     iam.kubesphere.io/auto-aggregate: "true"
+  name: cluster-admin
 aggregationRoleTemplates:
   roleSelector:
     matchLabels:
@@ -31,9 +30,8 @@ metadata:
   annotations:
     kubesphere.io/creator: system
     kubesphere.io/description: '{"zh": "查看集群中的所有资源。", "en": "View all resources in the cluster."}'
-  name: cluster-viewer
-  labels:
     iam.kubesphere.io/auto-aggregate: "true"
+  name: cluster-viewer
 aggregationRoleTemplates:
   roleSelector:
     matchLabels:
diff --git a/src/test/ks-core/templates/globalroles.yaml b/src/test/ks-core/templates/globalroles.yaml
index dff003ae8..74f1040e4 100644
--- a/src/test/ks-core/templates/globalroles.yaml
+++ b/src/test/ks-core/templates/globalroles.yaml
@@ -19,9 +19,8 @@ rules:
 apiVersion: iam.kubesphere.io/v1beta1
 kind: GlobalRole
 metadata:
-  labels:
-    iam.kubesphere.io/auto-aggregate: "true"
   annotations:
+    iam.kubesphere.io/auto-aggregate: "true"
     iam.kubesphere.io/rego-override: |-
       package authz
       default allow = false
@@ -168,7 +167,6 @@ metadata:
         allowedScopes := ["Workspace","Namespace","Cluster"]
         allowedScopes[_] == input.ResourceScope
       }
-  labels:
     iam.kubesphere.io/auto-aggregate: "true"
   name: platform-admin
 aggregationRoleTemplates: