update ks-core helm chart

kubesphere · Nov 30, 2023 · 3af665c · 3af665c
1 parent e18cc26
commit 3af665c
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 79 deletions.
diff --git a/src/test/ks-core/crds/application.kubesphere.io_applicationreleases.yaml b/src/test/ks-core/crds/application.kubesphere.io_applicationreleases.yaml
@@ -56,18 +56,18 @@ spec:
           spec:
             description: ApplicationReleaseSpec defines the desired state of ApplicationRelease
             properties:
-              app_id:
+              appID:
                 type: string
-              app_type:
+              appType:
                 type: string
-              appVersion_id:
+              appVersionID:
                 type: string
               values:
                 format: byte
                 type: string
             required:
-            - appVersion_id
-            - app_id
+            - appID
+            - appVersionID
             type: object
           status:
             description: ApplicationReleaseStatus defines the observed state of ApplicationRelease

diff --git a/src/test/ks-core/crds/application.kubesphere.io_applications.yaml b/src/test/ks-core/crds/application.kubesphere.io_applications.yaml
@@ -17,9 +17,6 @@ spec:
   scope: Cluster
   versions:
   - additionalPrinterColumns:
-    - jsonPath: .spec.displayName.en
-      name: application name
-      type: string
     - jsonPath: .metadata.labels.kubesphere\.io/workspace
       name: workspace
       type: string
@@ -53,18 +50,8 @@ spec:
                 type: string
               appType:
                 type: string
-              description:
-                additionalProperties:
-                  type: string
-                type: object
-              displayName:
-                additionalProperties:
-                  type: string
-                type: object
               icon:
                 type: string
-            required:
-            - displayName
             type: object
           status:
             description: ApplicationStatus defines the observed state of Application

diff --git a/src/test/ks-core/crds/application.kubesphere.io_applicationversions.yaml b/src/test/ks-core/crds/application.kubesphere.io_applicationversions.yaml
@@ -17,9 +17,6 @@ spec:
   scope: Cluster
   versions:
   - additionalPrinterColumns:
-    - jsonPath: .spec.displayName.en
-      name: application name
-      type: string
     - jsonPath: .status.state
       name: State
       type: string
@@ -47,51 +44,33 @@ spec:
           spec:
             description: ApplicationVersionSpec defines the desired state of ApplicationVersion
             properties:
+              appHome:
+                type: string
               appType:
                 type: string
               created:
                 format: date-time
                 type: string
-              description:
-                additionalProperties:
-                  type: string
-                type: object
               digest:
                 type: string
-              displayName:
-                additionalProperties:
-                  type: string
-                type: object
-              home:
-                type: string
               icon:
                 type: string
               maintainer:
                 items:
                   description: Maintainer describes a Chart maintainer.
                   properties:
                     email:
-                      description: Email is an optional email address to contact the
-                        named maintainer
                       type: string
                     name:
-                      description: Name is a user name or organization name
                       type: string
                     url:
-                      description: URL is an optional URL to an address for the named
-                        maintainer
                       type: string
                   type: object
                 type: array
-              sources:
-                items:
-                  type: string
-                type: array
-              version:
+              versionName:
                 type: string
             required:
-            - displayName
-            - version
+            - versionName
             type: object
           status:
             description: ApplicationVersionStatus defines the observed state of ApplicationVersion
@@ -103,7 +82,7 @@ spec:
               updated:
                 format: date-time
                 type: string
-              user_name:
+              userName:
                 type: string
             type: object
         type: object

diff --git a/src/test/ks-core/crds/application.kubesphere.io_categories.yaml b/src/test/ks-core/crds/application.kubesphere.io_categories.yaml
@@ -46,25 +46,14 @@ spec:
           spec:
             description: CategorySpec defines the desired state of HelmRepo
             properties:
-              description:
-                additionalProperties:
-                  type: string
-                type: object
-              displayName:
-                additionalProperties:
-                  type: string
-                type: object
               icon:
                 type: string
               locale:
                 type: string
-            required:
-            - displayName
             type: object
           status:
             properties:
               total:
-                description: total helmapplications belong to this category
                 type: integer
             required:
             - total

diff --git a/src/test/ks-core/crds/application.kubesphere.io_helmrepos.yaml b/src/test/ks-core/crds/application.kubesphere.io_helmrepos.yaml
@@ -95,15 +95,9 @@ spec:
             description: HelmRepoStatus defines the observed state of HelmRepo
             properties:
               lastUpdateTime:
-                description: status last update time
                 format: date-time
                 type: string
-              specHash:
-                description: current release spec hash This is used to compare whether
-                  the spec has been modified to determine sync is needed.
-                type: string
               state:
-                description: current state of the repo, successful, failed or syncing
                 type: string
             type: object
         type: object

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 }}