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

Update ks-core helm chart

src/test/ks-core/Chart.yaml

@@ -7,7 +7,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.5.0
+version: 0.5.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

src/test/ks-core/README.md

@@ -0,0 +1,22 @@
+### Upgrade from KSE 3.X
+
+```bash
+ITEMS=(
+    "globalroles.iam.kubesphere.io/anonymous"
+    "globalroles.iam.kubesphere.io/authenticated"
+    "globalroles.iam.kubesphere.io/platform-admin"
+    "globalroles.iam.kubesphere.io/platform-regular"
+    "globalroles.iam.kubesphere.io/platform-self-provisioner"
+    "globalroles.iam.kubesphere.io/pre-registration"
+    "globalrolebindings.iam.kubesphere.io/anonymous"
+    "globalrolebindings.iam.kubesphere.io/authenticated"
+    "globalrolebindings.iam.kubesphere.io/pre-registration"
+    "workspacetemplate.tenant.kubesphere.io/system-workspace"
+)
+for i in "${ITEMS[@]}"
+do
+   kubectl label $i app.kubernetes.io/managed-by=Helm --overwrite
+   kubectl annotate $i meta.helm.sh/release-name=ks-core --overwrite
+   kubectl annotate $i meta.helm.sh/release-namespace=kubesphere-system --overwrite
+done
+```

src/test/ks-core/crds/application.kubesphere.io_applicationreleases.yaml

@@ -56,47 +56,46 @@ 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
             properties:
               jobName:
-                description: JobName for installation and upgrade
                 type: string
               lastDeployed:
-                description: last deploy time or upgrade time
                 format: date-time
                 type: string
               lastUpdate:
-                description: last update time
                 format: date-time
                 type: string
               message:
-                description: A human readable message indicating details about why
-                  the release is in this state.
                 type: string
+              realTimeResources:
+                items:
+                  description: RawMessage is a raw encoded JSON value. It implements
+                    Marshaler and Unmarshaler and can be used to delay JSON decoding
+                    or precompute a JSON encoding.
+                  format: byte
+                  type: string
+                type: array
               specHash:
-                description: current release spec hash This is used to compare whether
-                  the spec has been modified to determine if an upgrade is needed.
+                description: This is used to compare whether the spec has been modified
+                  to determine if an upgrade is needed.
                 type: string
               state:
-                description: current state
                 type: string
-              version:
-                description: current release version
-                type: integer
             required:
             - state
             type: object

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

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

src/test/ks-core/crds/application.kubesphere.io_categories.yaml

@@ -17,9 +17,6 @@ spec:
   scope: Cluster
   versions:
   - additionalPrinterColumns:
-    - jsonPath: .spec.DisplayName.en
-      name: name
-      type: string
     - jsonPath: .status.total
       name: total
       type: string
@@ -46,25 +43,12 @@ 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

src/test/ks-core/crds/application.kubesphere.io_helmrepos.yaml → src/test/ks-core/crds/application.kubesphere.io_repos.yaml

@@ -4,16 +4,16 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: (unknown)
-  name: helmrepos.application.kubesphere.io
+  name: repos.application.kubesphere.io
 spec:
   group: application.kubesphere.io
   names:
-    kind: HelmRepo
-    listKind: HelmRepoList
-    plural: helmrepos
+    kind: Repo
+    listKind: RepoList
+    plural: repos
     shortNames:
-    - hrepo
-    singular: helmrepo
+    - repo
+    singular: repo
   scope: Cluster
   versions:
   - additionalPrinterColumns:
@@ -32,7 +32,7 @@ spec:
     name: v2
     schema:
       openAPIV3Schema:
-        description: HelmRepo is the Schema for the helmrepoes API
+        description: Repo is the Schema for the repoes API
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
@@ -47,10 +47,10 @@ spec:
           metadata:
             type: object
           spec:
-            description: HelmRepoSpec defines the desired state of HelmRepo
+            description: RepoSpec defines the desired state of Repo
             properties:
               credential:
-                description: helm repo credential
+                description: repo credential
                 properties:
                   caFile:
                     description: verify certificates of HTTPS-enabled servers using
@@ -77,33 +77,23 @@ spec:
               description:
                 description: chart repo description from frontend
                 type: string
-              name:
-                description: name of the repo
-                type: string
               syncPeriod:
                 description: sync period in seconds, no sync when SyncPeriod=0, the
                   minimum SyncPeriod is 180s
                 type: integer
               url:
-                description: helm repo url
+                description: repo url
                 type: string
             required:
-            - name
             - url
             type: object
           status:
-            description: HelmRepoStatus defines the observed state of HelmRepo
+            description: RepoStatus defines the observed state of Repo
             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

src/test/ks-core/crds/iam.kubesphere.io_globalrolebindings.yaml

@@ -16,6 +16,81 @@ spec:
     singular: globalrolebinding
   scope: Cluster
   versions:
+  - deprecated: true
+    name: v1alpha2
+    schema:
+      openAPIV3Schema:
+        description: GlobalRoleBinding is the Schema for the globalrolebindings API
+        properties:
+          apiVersion:
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            type: string
+          kind:
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            type: string
+          metadata:
+            type: object
+          roleRef:
+            description: RoleRef can only reference a GlobalRole. If the RoleRef cannot
+              be resolved, the Authorizer must return an error.
+            properties:
+              apiGroup:
+                description: APIGroup is the group for the resource being referenced
+                type: string
+              kind:
+                description: Kind is the type of resource being referenced
+                type: string
+              name:
+                description: Name is the name of resource being referenced
+                type: string
+            required:
+            - apiGroup
+            - kind
+            - name
+            type: object
+            x-kubernetes-map-type: atomic
+          subjects:
+            description: Subjects holds references to the objects the role applies
+              to.
+            items:
+              description: Subject contains a reference to the object or user identities
+                a role binding applies to.  This can either hold a direct API object
+                reference, or a value for non-objects such as user and group names.
+              properties:
+                apiGroup:
+                  description: APIGroup holds the API group of the referenced subject.
+                    Defaults to "" for ServiceAccount subjects. Defaults to "rbac.authorization.k8s.io"
+                    for User and Group subjects.
+                  type: string
+                kind:
+                  description: Kind of object being referenced. Values defined by
+                    this API group are "User", "Group", and "ServiceAccount". If the
+                    Authorizer does not recognized the kind value, the Authorizer
+                    should report an error.
+                  type: string
+                name:
+                  description: Name of the object being referenced.
+                  type: string
+                namespace:
+                  description: Namespace of the referenced object.  If the object
+                    kind is non-namespace, such as "User" or "Group", and this value
+                    is not empty the Authorizer should report an error.
+                  type: string
+              required:
+              - kind
+              - name
+              type: object
+              x-kubernetes-map-type: atomic
+            type: array
+        required:
+        - roleRef
+        type: object
+    served: true
+    storage: false
   - name: v1beta1
     schema:
       openAPIV3Schema: