Skip to content

Commit

Permalink
update ks-core helm chart
Browse files Browse the repository at this point in the history
  • Loading branch information
ks-ci-bot committed Dec 13, 2023
1 parent ef27ab2 commit 4673808
Show file tree
Hide file tree
Showing 17 changed files with 353 additions and 393 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 0 additions & 13 deletions src/test/ks-core/crds/application.kubesphere.io_applications.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -103,7 +82,7 @@ spec:
updated:
format: date-time
type: string
user_name:
userName:
type: string
type: object
type: object
Expand Down
16 changes: 0 additions & 16 deletions src/test/ks-core/crds/application.kubesphere.io_categories.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ spec:
scope: Cluster
versions:
- additionalPrinterColumns:
- jsonPath: .spec.DisplayName.en
name: name
type: string
- jsonPath: .status.total
name: total
type: string
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
singular: repo
scope: Cluster
versions:
- additionalPrinterColumns:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
31 changes: 20 additions & 11 deletions src/test/ks-core/templates/NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,20 +1,29 @@
Please wait for several seconds for KubeSphere deployment to complete.
Thank you for choosing KubeSphere Helm Chart.

1. Make sure KubeSphere components are running:
Please be patient and wait for several seconds for the KubeSphere deployment to complete.

kubectl get pods -n {{ .Release.Namespace }}
1. Wait for Deployment Completion

2. Then you should be able to visit the console NodePort:
Confirm that all KubeSphere components are running by executing the following command:

kubectl get pods -n {{ .Release.Namespace }}

2. Access the KubeSphere Console

Once the deployment is complete, you can access the KubeSphere console using the following URL: {{"\n"}}
{{- if not .Values.internalTLS }}
Console: http://{{ include "getNodeAddress" . }}:{{ .Values.console.nodePort }}
http://{{ include "getNodeAddress" . }}:{{ .Values.console.nodePort }}
{{- else }}
Console: https://{{ include "getNodeAddress" . }}:{{ .Values.console.nodePort }}
https://{{ include "getNodeAddress" . }}:{{ .Values.console.nodePort }}
{{- end }}

3. To login to your KubeSphere console:
3. Login to KubeSphere Console

Use the following credentials to log in:

Account: admin
Password: {{ include "printOrDefaultPass" . }}

Account: admin
Password: {{ include "printOrDefaultPass" . | quote }}
NOTE: Please change the default password after login.
NOTE: It is highly recommended to change the default password immediately after the first login.

For more details, please visit https://kubesphere.io.
For additional information and details, please visit https://kubesphere.io.
39 changes: 0 additions & 39 deletions src/test/ks-core/templates/app-category.yaml

This file was deleted.

27 changes: 0 additions & 27 deletions src/test/ks-core/templates/app-gobalrole.yaml

This file was deleted.

Loading

0 comments on commit 4673808

Please sign in to comment.