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

Update ks-core helm chart
kubesphere · Feb 6, 2024 · 87118ad · 87118ad
2 parents dd2fde5 + 0ca550d
commit 87118ad
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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 }}
+{{- end }}
diff --git 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
@@ -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