update ks-core helm chart

kubesphere · Nov 28, 2023 · 8f5caf4 · 8f5caf4
1 parent e18cc26
commit 8f5caf4
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 18 deletions.
diff --git a/src/test/ks-core/templates/app-gobalrole.yaml b/src/test/ks-core/templates/app-gobalrole.yaml
@@ -7,10 +7,35 @@ rules:
       - application.kubesphere.io
     resources:
       - 'apps'
+      - 'categories'
       - 'apps/versions'
     verbs:
       - get
       - list
+  # Permissions required to create edge app
+  - apiGroups:
+      - resources.kubesphere.io
+    resources:
+      - 'deployments'
+    verbs:
+      - get
+      - list
+  - apiGroups:
+      - ''
+    resources:
+      - 'secrets'
+      - 'limitranges'
+    verbs:
+      - get
+      - list
+  # Permissions required to install the edge app release
+  - apiGroups:
+      - infra.kubesphere.io
+    resources:
+      - 'nodetrees'
+    verbs:
+      - get
+      - list
 
 ---
 apiVersion: iam.kubesphere.io/v1beta1

diff --git a/src/test/ks-core/templates/app-roletemplates.yaml b/src/test/ks-core/templates/app-roletemplates.yaml
@@ -146,20 +146,6 @@ spec:
       - 'applications'
     verbs:
       - '*'
-  # 创建边缘 app 需要的权限
-  - apiGroups:
-      - resources.kubesphere.io
-    resources:
-      - 'deployments'
-    verbs:
-      - '*'
-  - apiGroups:
-      - ''
-    resources:
-      - 'secrets'
-      - 'limitranges'
-    verbs:
-      - '*'
 
 # namespace scope role templates
 ---
@@ -206,11 +192,11 @@ metadata:
   name: namespace-manage-app-releases
 spec:
   description:
-    en: 'Namespace App Releases View'
+    en: 'Namespace App Releases Management'
     zh: '项目下部署升级应用实例。'
   displayName:
-    en: 'Namespace App Releases View'
-    zh: '应用实例'
+    en: 'Namespace App Releases Management'
+    zh: '应用实例部署升级'
   rules:
   - apiGroups:
       - application.kubesphere.io

diff --git a/src/test/ks-core/templates/kubesphere-config.yaml b/src/test/ks-core/templates/kubesphere-config.yaml
@@ -33,4 +33,8 @@ data:
       node:
         image:  {{ template "nodeShell.image" . }}
     helmImage: {{ template "helm.image" . }}
+{{- if .Values.devMode }}
+    telemetry:
+      ksCloudUrl: "https://clouddev.kubesphere.io"
+{{- end }}
 {{- end }}
diff --git a/src/test/ks-core/templates/marketplace-config.yaml b/src/test/ks-core/templates/marketplace-config.yaml
@@ -2,6 +2,18 @@
 apiVersion: v1
 stringData:
   configuration.yaml: |
+{{- if .Values.devMode }}
+    url: https://clouddev.kubesphere.io
+    oauth:
+      clientID: "client-a5cdf64c-7f84-415e-a6b1-8dfbfad493c3"
+      clientSecret: "66ce75fc-4a87-4f97-9963-92d1a19b137e"
+    subscription:
+      syncPeriod: 60m
+    repository:
+      url: https://clouddev.kubesphere.io
+      repoName: marketplace
+      syncPeriod: 60m
+{{- else }}
     url: https://kubesphere.cloud
     oauth:
       clientID: "client-a5cdf64c-7f84-415e-a6b1-8dfbfad493c3"
@@ -12,11 +24,12 @@ stringData:
       url: https://app.kubesphere.cloud
       repoName: marketplace
       syncPeriod: 60m
+{{- end }}
 kind: Secret
 metadata:
   name: marketplace
   namespace: kubesphere-system
   labels:
     config.kubesphere.io/type: marketplace
 type: config.kubesphere.io/marketplace
-{{ end }}
+{{ end }}