Merge pull request #325 from kubesphere/sync/ks-core

Update ks-core helm chart
kubesphere · Aug 9, 2023 · 290c07f · 290c07f
2 parents f04caa9 + ac7dd4b
commit 290c07f
Show file tree

Hide file tree

Showing 5 changed files with 138 additions and 84 deletions.
diff --git a/src/test/ks-core/templates/builtinroles.yaml b/src/test/ks-core/templates/builtinroles.yaml
@@ -127,7 +127,7 @@ metadata:
 role:
   aggregationRoleTemplates:
     roleSelectors:
-      - matchLabels: { }
+      - matchLabels: {}
     templateNames:
       - workspace-manage-workspace-settings
       - workspace-view-workspace-settings
@@ -216,7 +216,7 @@ role:
     labels:
       iam.kubesphere.io/auto-aggregate: "true"
     name: self-provisioner
-  rules: [ ]
+  rules: []
 
 ---
 apiVersion: iam.kubesphere.io/v1beta1

diff --git a/src/test/ks-core/templates/clusterroles.yaml b/src/test/ks-core/templates/clusterroles.yaml
@@ -3,6 +3,7 @@ kind: ClusterRole
 metadata:
   annotations:
     kubesphere.io/creator: system
+    kubesphere.io/description: '{"zh": "管理集群中的所有资源。", "en": "Manage all resources in the cluster."}'
   name: cluster-admin
 aggregationRoleTemplates:
   roleSelector:
@@ -27,6 +28,7 @@ kind: ClusterRole
 metadata:
   annotations:
     kubesphere.io/creator: system
+    kubesphere.io/description: '{"zh": "查看集群中的所有资源。", "en": "View all resources in the cluster."}'
   name: cluster-viewer
 aggregationRoleTemplates:
   roleSelector:

diff --git a/src/test/ks-core/templates/roletemplate-categories.yaml b/src/test/ks-core/templates/roletemplate-categories.yaml
@@ -1,4 +1,3 @@
-{{ if eq .Values.role "host" }}
 ---
 apiVersion: iam.kubesphere.io/v1beta1
 kind: Category
@@ -90,20 +89,6 @@ spec:
     en: Cluster Settings
     zh: '集群设置'
 
----
-apiVersion: iam.kubesphere.io/v1beta1
-kind: Category
-metadata:
-  labels:
-    iam.kubesphere.io/scope: "cluster"
-    kubesphere.io/managed: 'true'
-  name: cluster-network-management
-spec:
-  displayName:
-    en: Network
-    zh: '网络'
-
-
 ---
 apiVersion: iam.kubesphere.io/v1beta1
 kind: Category
@@ -232,5 +217,4 @@ metadata:
 spec:
   displayName:
     en: Project Settings
-    zh: '项目设置'
-{{ end }}
+    zh: '项目设置'