admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update ks-core helm chart (#6401)

Browse Source 
fix: cherrypick update ks-core helm chart

Signed-off-by: peng wu <2030047311@qq.com>
This commit is contained in:
smartcat999
2025-03-11 09:57:48 +08:00
committed by GitHub
parent 41fdd0f4eb
commit 7e2cafd15b
18 changed files with 46 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/ks-core/templates/kubesphere-config.yaml
View File

@@ -18,7 +18,7 @@ data:
url: {{ include "portal.url" . | quote }}
jwtSecret: {{ include "jwtSecret" . | quote }}
maximumClockSkew: {{ .Values.authentication.issuer.maximumClockSkew | default "10s" }}
{{- if eq (include "role" .) "member" }}
{{- if eq (include "multicluster.role" .) "member" }}
accessTokenMaxAge: 0s
{{- else }}
accessTokenMaxAge: {{ .Values.authentication.issuer.accessTokenMaxAge }}
@@ -35,8 +35,8 @@ data:
bucket: {{ .Values.s3.bucket | default "uploads" }}
{{- end }}
multicluster:
clusterRole: {{ include "role" . | quote }}
hostClusterName: {{ include "hostClusterName" . | include "validateHostClusterName" | quote }}
clusterRole: {{ include "multicluster.role" . | quote }}
hostClusterName: {{ include "multicluster.hostClusterName" . | include "validateHostClusterName" | quote }}
terminal:
kubectl:
image: {{ template "kubectl.image" . }}
@@ -77,7 +77,7 @@ data:
appSelector: {{ .Values.composedApp.appSelector | quote }}
kubesphere:
tls: {{ .Values.internalTLS }}
{{- if and (eq (include "role" .) "host") .Values.ha.enabled -}}
{{- if and (eq (include "multicluster.role" .) "host") .Values.ha.enabled -}}
{{- if .Values.ha.cache }}
cache: {{- toYaml .Values.ha.cache | nindent 6}}
{{- else }}