diff --git a/src/test/ks-core/Chart.yaml b/src/test/ks-core/Chart.yaml index 8080014f0..bdb6c197b 100644 --- a/src/test/ks-core/Chart.yaml +++ b/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.3 +version: 0.5.4 # 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 diff --git a/src/test/ks-core/README.md b/src/test/ks-core/README.md index cdf829aaf..988cf5a55 100644 --- a/src/test/ks-core/README.md +++ b/src/test/ks-core/README.md @@ -10,6 +10,7 @@ ITEMS=( "globalroles.iam.kubesphere.io/platform-regular" "globalroles.iam.kubesphere.io/platform-self-provisioner" "globalroles.iam.kubesphere.io/pre-registration" + "globalrolebindings.iam.kubesphere.io/admin" "globalrolebindings.iam.kubesphere.io/anonymous" "globalrolebindings.iam.kubesphere.io/authenticated" "globalrolebindings.iam.kubesphere.io/pre-registration" @@ -23,14 +24,14 @@ do kubectl annotate $i meta.helm.sh/release-namespace=kubesphere-system --overwrite done -items=$(kubectl get workspacetemplate -o jsonpath='{.items[*].metadata.name}') +items=$(kubectl get workspace -o jsonpath='{.items[*].metadata.name}') for i in $items do - network_isolation=$(kubectl get workspacetemplate $i -o jsonpath='{.spec.template.spec.networkIsolation}') + network_isolation=$(kubectl get workspace $i -o jsonpath='{.spec.networkIsolation}') if [ "$network_isolation" == "true" ]; then - kubectl annotate workspacetemplate $i kubesphere.io/network-isolate=enabled --overwrite + kubectl annotate workspace $i kubesphere.io/network-isolate=enabled --overwrite fi done -``` \ No newline at end of file +``` diff --git a/src/test/ks-core/crds/application.kubesphere.io_applications.yaml b/src/test/ks-core/crds/application.kubesphere.io_applications.yaml index 0af697fe5..c2ee14198 100644 --- a/src/test/ks-core/crds/application.kubesphere.io_applications.yaml +++ b/src/test/ks-core/crds/application.kubesphere.io_applications.yaml @@ -46,10 +46,16 @@ spec: spec: description: ApplicationSpec defines the desired state of Application properties: + abstraction: + type: string appHome: type: string appType: type: string + attachments: + items: + type: string + type: array icon: type: string type: object diff --git a/src/test/ks-core/crds/tenant.kubesphere.io_workspaces.yaml b/src/test/ks-core/crds/tenant.kubesphere.io_workspaces.yaml index 7d0afc958..cdb45f61f 100644 --- a/src/test/ks-core/crds/tenant.kubesphere.io_workspaces.yaml +++ b/src/test/ks-core/crds/tenant.kubesphere.io_workspaces.yaml @@ -16,7 +16,7 @@ spec: singular: workspace scope: Cluster versions: - - name: v1alpha1 + - name: v1beta1 schema: openAPIV3Schema: description: Workspace is the Schema for the workspaces API diff --git a/src/test/ks-core/crds/tenant.kubesphere.io_workspacetemplates.yaml b/src/test/ks-core/crds/tenant.kubesphere.io_workspacetemplates.yaml index 37e07f075..d7aeff622 100644 --- a/src/test/ks-core/crds/tenant.kubesphere.io_workspacetemplates.yaml +++ b/src/test/ks-core/crds/tenant.kubesphere.io_workspacetemplates.yaml @@ -16,7 +16,7 @@ spec: singular: workspacetemplate scope: Cluster versions: - - name: v1alpha2 + - name: v1beta1 schema: openAPIV3Schema: description: WorkspaceTemplate is the Schema for the workspacetemplates API @@ -35,29 +35,6 @@ spec: type: object spec: properties: - overrides: - items: - properties: - clusterName: - type: string - clusterOverrides: - items: - properties: - op: - type: string - path: - type: string - value: - type: object - x-kubernetes-preserve-unknown-fields: true - required: - - path - type: object - type: array - required: - - clusterName - type: object - type: array placement: properties: clusterSelector: diff --git a/src/test/ks-core/templates/oauthclient-config.yaml b/src/test/ks-core/templates/oauthclient-config.yaml index 5539f59a8..4b96352b7 100644 --- a/src/test/ks-core/templates/oauthclient-config.yaml +++ b/src/test/ks-core/templates/oauthclient-config.yaml @@ -10,8 +10,6 @@ stringData: - 'openid' - 'email' - 'profile' - accessTokenMaxAge: 7200 - accessTokenInactivityTimeout: 7200 kind: Secret metadata: name: oauthclient-kubesphere diff --git a/src/test/ks-core/templates/workspace.yaml b/src/test/ks-core/templates/workspace.yaml index ce8d9d9f7..40ec9a335 100644 --- a/src/test/ks-core/templates/workspace.yaml +++ b/src/test/ks-core/templates/workspace.yaml @@ -1,5 +1,5 @@ {{ if eq .Values.role "host" }} -apiVersion: tenant.kubesphere.io/v1alpha2 +apiVersion: tenant.kubesphere.io/v1beta1 kind: WorkspaceTemplate metadata: annotations: