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

update ks-core helm chart (#6401) (#6407)

Browse Source 
fix: cherrypick update ks-core helm chart



(cherry picked from commit 7e2cafd15b)

Signed-off-by: peng wu <2030047311@qq.com>
This commit is contained in:
smartcat999
2025-03-11 10:41:48 +08:00
committed by GitHub
parent 81c74f28d4
commit 23e7e6d179
18 changed files with 47 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
config/ks-core/templates/_helpers.tpl
View File

@@ -116,8 +116,8 @@ Create the name of the secret of sa token.
{{- end }}
{{- end }}
{{- define "role" -}}
{{- if eq .Values.role "" }}
{{- define "multicluster.role" -}}
{{- if eq $.Values.multicluster.role "" }}
{{- with lookup "v1" "ConfigMap" (printf "%s" .Release.Namespace) "kubesphere-config" }}
{{- with (fromYaml (index .data "kubesphere.yaml")) }}
{{- if and .multicluster (.multicluster).clusterRole }}
@@ -127,36 +127,36 @@ Create the name of the secret of sa token.
{{- .multicluster.clusterRole }}
{{- end }}
{{- else }}
{{- $.Values.role | default "host" }}
{{- $.Values.multicluster.role | default "host" }}
{{- end }}
{{- else }}
{{- $.Values.role | default "host" }}
{{- $.Values.multicluster.role | default "host" }}
{{- end }}
{{- else }}
{{- $.Values.role | default "host" }}
{{- $.Values.multicluster.role | default "host" }}
{{- end }}
{{- else }}
{{- .Values.role }}
{{- $.Values.multicluster.role }}
{{- end }}
{{- end }}
{{- define "hostClusterName" -}}
{{- if eq .Values.hostClusterName "" }}
{{- define "multicluster.hostClusterName" -}}
{{- if eq $.Values.multicluster.hostClusterName "" }}
{{- with lookup "v1" "ConfigMap" (printf "%s" .Release.Namespace) "kubesphere-config" }}
{{- with (fromYaml (index .data "kubesphere.yaml")) }}
{{- if and .multicluster (.multicluster).hostClusterName }}
{{- .multicluster.hostClusterName }}
{{- else }}
{{- $.Values.hostClusterName | default "host" }}
{{- $.Values.multicluster.hostClusterName | default "host" }}
{{- end }}
{{- else }}
{{- $.Values.hostClusterName | default "host" }}
{{- $.Values.multicluster.hostClusterName | default "host" }}
{{- end }}
{{- else }}
{{- $.Values.hostClusterName | default "host" }}
{{- $.Values.multicluster.hostClusterName | default "host" }}
{{- end }}
{{- else }}
{{- .Values.hostClusterName }}
{{- $.Values.multicluster.hostClusterName }}
{{- end }}
{{- end }}