From 0ca550df36e4a72d7967b5863d4dc4b3f270fe48 Mon Sep 17 00:00:00 2001 From: ci-bot Date: Mon, 5 Feb 2024 02:38:54 +0000 Subject: [PATCH] update ks-core helm chart --- src/test/ks-core/Chart.yaml | 2 +- .../crds/cluster.kubesphere.io_labels.yaml | 61 +++++++++++++++++++ src/test/ks-core/templates/_helpers.tpl | 6 +- .../ks-core/templates/kubesphere-config.yaml | 2 + src/test/ks-core/values.yaml | 11 ++-- 5 files changed, 73 insertions(+), 9 deletions(-) create mode 100644 src/test/ks-core/crds/cluster.kubesphere.io_labels.yaml diff --git a/src/test/ks-core/Chart.yaml b/src/test/ks-core/Chart.yaml index 314916d5..826e2c44 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.6.1 +version: 0.6.2 # 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/crds/cluster.kubesphere.io_labels.yaml b/src/test/ks-core/crds/cluster.kubesphere.io_labels.yaml new file mode 100644 index 00000000..24c71a8a --- /dev/null +++ b/src/test/ks-core/crds/cluster.kubesphere.io_labels.yaml @@ -0,0 +1,61 @@ +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: (unknown) + name: labels.cluster.kubesphere.io +spec: + group: cluster.kubesphere.io + names: + kind: Label + listKind: LabelList + plural: labels + singular: label + scope: Cluster + versions: + - additionalPrinterColumns: + - jsonPath: .spec.key + name: Key + type: string + - jsonPath: .spec.value + name: Value + type: string + 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: + backgroundColor: + type: string + clusters: + items: + type: string + type: array + key: + type: string + value: + type: string + required: + - key + - value + type: object + required: + - spec + type: object + served: true + storage: true + subresources: {} diff --git a/src/test/ks-core/templates/_helpers.tpl b/src/test/ks-core/templates/_helpers.tpl index a93ecb63..3bc005ae 100644 --- a/src/test/ks-core/templates/_helpers.tpl +++ b/src/test/ks-core/templates/_helpers.tpl @@ -78,7 +78,9 @@ Create the name of the service account to use {{- if eq .Values.role "host" }} {{- with lookup "v1" "ConfigMap" (printf "%s" .Release.Namespace) "kubesphere-config" }} {{- with (fromYaml (index .data "kubesphere.yaml")) }} -{{- if and .authentication (.authentication).issuer ((.authentication).issuer).jwtSecret }} +{{- if and .authentication (.authentication).jwtSecret }} +{{- .authentication.jwtSecret }} +{{- else if and .authentication (.authentication).issuer ((.authentication).issuer).jwtSecret }} {{- .authentication.issuer.jwtSecret }} {{- else }} {{- $.Values.authentication.issuer.jwtSecret | default (randAlphaNum 32 ) }} @@ -128,4 +130,4 @@ Returns user's password or use default. Used by NOTES.txt {{- else }} {{- end }} {{- printf "%s" $address }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/src/test/ks-core/templates/kubesphere-config.yaml b/src/test/ks-core/templates/kubesphere-config.yaml index 018170c8..ed1d1e15 100644 --- a/src/test/ks-core/templates/kubesphere-config.yaml +++ b/src/test/ks-core/templates/kubesphere-config.yaml @@ -33,6 +33,8 @@ data: {{- if .Values.extension.nodeSelector }} nodeSelector: {{- toYaml .Values.extension.nodeSelector | nindent 8 }} {{- end }} + kubesphere: + tls: {{ .Values.internalTLS }} {{- if .Values.devMode }} telemetry: ksCloudURL: "https://clouddev.kubesphere.io" diff --git a/src/test/ks-core/values.yaml b/src/test/ks-core/values.yaml index e0d452aa..2d836feb 100644 --- a/src/test/ks-core/values.yaml +++ b/src/test/ks-core/values.yaml @@ -267,8 +267,7 @@ nodeShell: extension: imageRegistry: "" - nodeSelector: - key: value + nodeSelector: {} upgrade: disabled: true @@ -445,7 +444,7 @@ upgrade: configMapKey: "chart.tgz" configMapNamespace: "kubesphere-system" chartsPath: "" - installationMode: HostOnly + installationMode: Multicluster servicemesh: disabled: false priority: 100 @@ -457,10 +456,10 @@ upgrade: configMapKey: "chart.tgz" configMapNamespace: "kubesphere-system" chartsPath: "" - installationMode: HostOnly + installationMode: Multicluster config: | kiali: - prometheus_url: http://prometheus-operated.kubesphere-monitoring-system.svc:9090 + prometheus_url: http://prometheus-k8s.kubesphere-monitoring-system.svc:9090 jaeger: storage: options: @@ -619,7 +618,7 @@ upgrade: configMapKey: "chart.tgz" configMapNamespace: "kubesphere-system" chartsPath: "" - installationMode: HostOnly + installationMode: Multicluster whizard-auditing: disabled: false