From 89a10df0efc6cee497f34e013423de857a5f1ec8 Mon Sep 17 00:00:00 2001 From: ci-bot Date: Wed, 2 Aug 2023 02:43:54 +0000 Subject: [PATCH] update ks-core helm chart --- src/test/ks-core/Chart.yaml | 4 +- ...tore.kubesphere.io_applicationclasses.yaml | 71 ++++++++++ ...re.kubesphere.io_applicationresources.yaml | 110 +++++++++++++++ .../appstore.kubesphere.io_applications.yaml | 127 ++++++++++++++++++ .../ks-core/templates/builtin-resources.yaml | 5 +- .../ks-core/templates/role-templates.yaml | 33 ++--- src/test/ks-core/values.yaml | 2 +- 7 files changed, 332 insertions(+), 20 deletions(-) create mode 100644 src/test/ks-core/crds/appstore.kubesphere.io_applicationclasses.yaml create mode 100644 src/test/ks-core/crds/appstore.kubesphere.io_applicationresources.yaml create mode 100644 src/test/ks-core/crds/appstore.kubesphere.io_applications.yaml diff --git a/src/test/ks-core/Chart.yaml b/src/test/ks-core/Chart.yaml index aa1b1fea..2987a2e1 100644 --- a/src/test/ks-core/Chart.yaml +++ b/src/test/ks-core/Chart.yaml @@ -7,9 +7,9 @@ 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.3.4 +version: 0.3.5 # 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 # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: "v4.0.0-beta.4" +appVersion: "v4.0.0-beta.5" diff --git a/src/test/ks-core/crds/appstore.kubesphere.io_applicationclasses.yaml b/src/test/ks-core/crds/appstore.kubesphere.io_applicationclasses.yaml new file mode 100644 index 00000000..467cd12d --- /dev/null +++ b/src/test/ks-core/crds/appstore.kubesphere.io_applicationclasses.yaml @@ -0,0 +1,71 @@ +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: (unknown) + creationTimestamp: null + name: applicationclasses.appstore.kubesphere.io +spec: + group: appstore.kubesphere.io + names: + kind: ApplicationClass + listKind: ApplicationClassList + plural: applicationclasses + singular: applicationclass + scope: Cluster + versions: + - name: v1alpha1 + schema: + openAPIV3Schema: + 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 + parameters: + additionalProperties: + type: string + type: object + provisioner: + type: string + spec: + properties: + appVersion: + type: string + description: + type: string + icon: + type: string + maintainers: + items: + properties: + email: + description: Email is an optional email address to contact the + named maintainer + type: string + name: + description: Name is a username 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 + packageVersion: + type: string + type: object + required: + - provisioner + type: object + served: true + storage: true diff --git a/src/test/ks-core/crds/appstore.kubesphere.io_applicationresources.yaml b/src/test/ks-core/crds/appstore.kubesphere.io_applicationresources.yaml new file mode 100644 index 00000000..8ed1cf02 --- /dev/null +++ b/src/test/ks-core/crds/appstore.kubesphere.io_applicationresources.yaml @@ -0,0 +1,110 @@ +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: (unknown) + creationTimestamp: null + name: applicationresources.appstore.kubesphere.io +spec: + group: appstore.kubesphere.io + names: + kind: ApplicationResource + listKind: ApplicationResourceList + plural: applicationresources + singular: applicationresource + scope: Cluster + versions: + - name: v1alpha1 + schema: + openAPIV3Schema: + 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 + spec: + properties: + claimRef: + description: "ObjectReference contains enough information to let you + inspect or modify the referred object. --- New uses of this type + are discouraged because of difficulty describing its usage when + embedded in APIs. 1. Ignored fields. It includes many fields which + are not generally honored. For instance, ResourceVersion and FieldPath + are both very rarely valid in actual usage. 2. Invalid usage help. + \ It is impossible to add specific help for individual usage. In + most embedded usages, there are particular restrictions like, \"must + refer only to types A and B\" or \"UID not honored\" or \"name must + be restricted\". Those cannot be well described when embedded. 3. + Inconsistent validation. Because the usages are different, the + validation rules are different by usage, which makes it hard for + users to predict what will happen. 4. The fields are both imprecise + and overly precise. Kind is not a precise mapping to a URL. This + can produce ambiguity during interpretation and require a REST mapping. + \ In most cases, the dependency is on the group,resource tuple and + the version of the actual struct is irrelevant. 5. We cannot easily + change it. Because this type is embedded in many locations, updates + to this type will affect numerous schemas. Don't make new APIs + embed an underspecified API type they do not control. \n Instead + of using this type, create a locally provided and used type that + is well-focused on your reference. For example, ServiceReferences + for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533 + ." + properties: + apiVersion: + description: API version of the referent. + type: string + fieldPath: + description: 'If referring to a piece of an object instead of + an entire object, this string should contain a valid JSON/Go + field access statement, such as desiredState.manifest.containers[2]. + For example, if the object reference is to a container within + a pod, this would take on a value like: "spec.containers{name}" + (where "name" refers to the name of the container that triggered + the event) or if no container name is specified "spec.containers[2]" + (container with index 2 in this pod). This syntax is chosen + only to have some well-defined way of referencing a part of + an object. TODO: this design is not final and this field is + subject to change in the future.' + type: string + kind: + description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + name: + description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names' + type: string + namespace: + description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/' + type: string + resourceVersion: + description: 'Specific resourceVersion to which this reference + is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency' + type: string + uid: + description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids' + type: string + type: object + x-kubernetes-map-type: atomic + className: + type: string + type: object + status: + properties: + message: + type: string + phase: + type: string + reason: + type: string + type: object + type: object + served: true + storage: true diff --git a/src/test/ks-core/crds/appstore.kubesphere.io_applications.yaml b/src/test/ks-core/crds/appstore.kubesphere.io_applications.yaml new file mode 100644 index 00000000..8247a461 --- /dev/null +++ b/src/test/ks-core/crds/appstore.kubesphere.io_applications.yaml @@ -0,0 +1,127 @@ +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: (unknown) + creationTimestamp: null + name: applications.appstore.kubesphere.io +spec: + group: appstore.kubesphere.io + names: + kind: Application + listKind: ApplicationList + plural: applications + singular: application + scope: Namespaced + versions: + - name: v1alpha1 + schema: + openAPIV3Schema: + 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 + spec: + properties: + className: + type: string + parameters: + type: string + required: + - className + - parameters + type: object + status: + properties: + conditions: + items: + description: "Condition contains details for one aspect of the current + state of this API Resource. --- This struct is intended for direct + use as an array at the field path .status.conditions. For example, + \n type FooStatus struct{ // Represents the observations of a + foo's current state. // Known .status.conditions.type are: \"Available\", + \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge + // +listType=map // +listMapKey=type Conditions []metav1.Condition + `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" + protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }" + properties: + lastTransitionTime: + description: lastTransitionTime is the last time the condition + transitioned from one status to another. This should be when + the underlying condition changed. If that is not known, then + using the time when the API field changed is acceptable. + format: date-time + type: string + message: + description: message is a human readable message indicating + details about the transition. This may be an empty string. + maxLength: 32768 + type: string + observedGeneration: + description: observedGeneration represents the .metadata.generation + that the condition was set based upon. For instance, if .metadata.generation + is currently 12, but the .status.conditions[x].observedGeneration + is 9, the condition is out of date with respect to the current + state of the instance. + format: int64 + minimum: 0 + type: integer + reason: + description: reason contains a programmatic identifier indicating + the reason for the condition's last transition. Producers + of specific condition types may define expected values and + meanings for this field, and whether the values are considered + a guaranteed API. The value should be a CamelCase string. + This field may not be empty. + maxLength: 1024 + minLength: 1 + pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$ + type: string + status: + description: status of the condition, one of True, False, Unknown. + enum: + - "True" + - "False" + - Unknown + type: string + type: + description: type of condition in CamelCase or in foo.example.com/CamelCase. + --- Many .condition.type values are consistent across resources + like Available, but because arbitrary conditions can be useful + (see .node.status.conditions), the ability to deconflict is + important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt) + maxLength: 316 + pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ + type: string + required: + - lastTransitionTime + - message + - reason + - status + - type + type: object + type: array + message: + type: string + parameters: + additionalProperties: + type: string + type: object + resourceName: + type: string + state: + type: string + type: object + type: object + served: true + storage: true diff --git a/src/test/ks-core/templates/builtin-resources.yaml b/src/test/ks-core/templates/builtin-resources.yaml index 95e3c4bd..c41ad829 100644 --- a/src/test/ks-core/templates/builtin-resources.yaml +++ b/src/test/ks-core/templates/builtin-resources.yaml @@ -6,6 +6,7 @@ metadata: annotations: iam.kubesphere.io/uninitialized: "true" helm.sh/resource-policy: keep + iam.kubesphere.io/globalrole: "platform-admin" spec: email: admin@kubesphere.io password: {{ include "getOrDefaultPass" . | quote }} @@ -318,7 +319,7 @@ items: - aggregationRoleTemplates: roleSelector: matchLabels: - iam.kubesphere.io/operation: view + iam.kubesphere.io/aggregate-to-cluster-viewer: "" templateNames: - cluster-view-components - cluster-view-volume-snapshot-classes @@ -464,7 +465,7 @@ items: aggregationRoleTemplates: roleSelectors: - matchLabels: - iam.kubesphere.io/aggregate-to-admin: "" + scope.iam.kubesphere.io/namespace: "" templateNames: - workspace-manage-workspace-settings - workspace-view-workspace-settings diff --git a/src/test/ks-core/templates/role-templates.yaml b/src/test/ks-core/templates/role-templates.yaml index 452f2cb8..cf171895 100644 --- a/src/test/ks-core/templates/role-templates.yaml +++ b/src/test/ks-core/templates/role-templates.yaml @@ -176,9 +176,8 @@ items: labels: iam.kubesphere.io/category: cluster-settings scope.iam.kubesphere.io/cluster: "" + iam.kubesphere.io/aggregate-to-cluster-viewer: "" name: cluster-view-cluster-settings - resourceVersion: "4866229" - uid: 6acaedfd-1b51-4924-9841-4938d4e54edd spec: displayName: en: Cluster Settings View @@ -192,6 +191,7 @@ items: labels: iam.kubesphere.io/category: cluster-resources-management scope.iam.kubesphere.io/cluster: "" + iam.kubesphere.io/aggregate-to-cluster-viewer: "" name: cluster-view-components spec: displayName: @@ -205,6 +205,7 @@ items: labels: iam.kubesphere.io/category: cluster-resources-management scope.iam.kubesphere.io/cluster: "" + iam.kubesphere.io/aggregate-to-cluster-viewer: "" name: cluster-view-crds spec: displayName: @@ -218,6 +219,7 @@ items: labels: iam.kubesphere.io/category: access-control scope.iam.kubesphere.io/cluster: "" + iam.kubesphere.io/aggregate-to-cluster-viewer: "" name: cluster-view-members spec: displayName: @@ -271,6 +273,7 @@ items: labels: iam.kubesphere.io/category: project-resources-management scope.iam.kubesphere.io/cluster: "" + iam.kubesphere.io/aggregate-to-cluster-viewer: "" name: cluster-view-projects spec: displayName: @@ -285,6 +288,7 @@ items: labels: iam.kubesphere.io/category: access-control scope.iam.kubesphere.io/cluster: "" + iam.kubesphere.io/aggregate-to-cluster-viewer: "" name: cluster-view-roles spec: displayName: @@ -299,6 +303,7 @@ items: labels: iam.kubesphere.io/category: storage-management scope.iam.kubesphere.io/cluster: "" + iam.kubesphere.io/aggregate-to-cluster-viewer: "" name: cluster-view-storageclasses spec: displayName: @@ -314,6 +319,7 @@ items: labels: iam.kubesphere.io/category: storage-management scope.iam.kubesphere.io/cluster: "" + iam.kubesphere.io/aggregate-to-cluster-viewer: "" name: cluster-view-volume-snapshot-classes spec: displayName: @@ -328,6 +334,7 @@ items: labels: iam.kubesphere.io/category: storage-management scope.iam.kubesphere.io/cluster: "" + iam.kubesphere.io/aggregate-to-cluster-viewer: "" name: cluster-view-volume-snapshots spec: displayName: @@ -342,6 +349,7 @@ items: kubesphere.io/alias-name: Volumes View labels: iam.kubesphere.io/category: storage-management + iam.kubesphere.io/aggregate-to-cluster-viewer: "" scope.iam.kubesphere.io/cluster: "" name: cluster-view-volumes spec: @@ -1419,19 +1427,6 @@ items: - pods verbs: - list - - apiVersion: iam.kubesphere.io/v1beta1 - kind: RoleTemplate - metadata: - annotations: - iam.kubesphere.io/dependencies: '["cluster-view-members"]' - labels: - iam.kubesphere.io/category: access-control - scope.iam.kubesphere.io/cluster: "" - name: cluster-view-roles - spec: - displayName: - en: Cluster Roles View - rules: [] - apiVersion: iam.kubesphere.io/v1beta1 kind: RoleTemplate metadata: @@ -1439,6 +1434,7 @@ items: iam.kubesphere.io/role-template-rules: '{"projects": "create"}' labels: iam.kubesphere.io/category: projects-management + iam.kubesphere.io/aggregate-to-self-provisioner: "" scope.iam.kubesphere.io/workspace: "" name: workspace-create-projects spec: @@ -1708,6 +1704,7 @@ items: labels: iam.kubesphere.io/category: access-control scope.iam.kubesphere.io/workspace: "" + iam.kubesphere.io/aggregate-to-viewer: "" name: workspace-view-groups spec: displayName: @@ -1735,6 +1732,7 @@ items: iam.kubesphere.io/category: access-control iam.kubesphere.io/hidden-role-template: "true" scope.iam.kubesphere.io/workspace: "" + iam.kubesphere.io/aggregate-to-viewer: "" name: workspace-view-members spec: displayName: @@ -1756,6 +1754,7 @@ items: labels: iam.kubesphere.io/category: projects-management scope.iam.kubesphere.io/workspace: "" + iam.kubesphere.io/aggregate-to-viewer: "" name: workspace-view-projects spec: displayName: @@ -1857,6 +1856,7 @@ items: labels: iam.kubesphere.io/category: access-control scope.iam.kubesphere.io/workspace: "" + iam.kubesphere.io/aggregate-to-viewer: "" name: workspace-view-roles spec: displayName: @@ -1878,6 +1878,9 @@ items: labels: iam.kubesphere.io/category: workspace-settings scope.iam.kubesphere.io/workspace: "" + iam.kubesphere.io/aggregate-to-regular: "" + iam.kubesphere.io/aggregate-to-viewer: "" + iam.kubesphere.io/aggregate-to-self-provisioner: "" name: workspace-view-workspace-settings spec: displayName: diff --git a/src/test/ks-core/values.yaml b/src/test/ks-core/values.yaml index 7d51db65..a73daf16 100644 --- a/src/test/ks-core/values.yaml +++ b/src/test/ks-core/values.yaml @@ -2,7 +2,7 @@ ## @param global.tag Global Docker image tag global: imageRegistry: registry.cn-beijing.aliyuncs.com - tag: v4.0.0-beta.4 + tag: v4.0.0-beta.5 imagePullSecrets: [] ## @section Common parameters