15308555518/ kubekey
1
0
Fork 0
mirror of https://github.com/kubesphere/kubekey.git synced 2025-12-25 17:12:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: rename kubeExtraArgs to mapToNamedStringArgs 

Signed-off-by: William Wang <williamw0825@gmail.com>
This commit is contained in:
William Wang 2025-12-25 18:22:59 +08:00
parent b7d1c9bc87
commit e9e9377049
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/core/roles/kubernetes/init-kubernetes/templates/kubeadm/kubeadm-init.v1beta4
View File

@ -73,7 +73,7 @@ apiServer:
value: /etc/kubernetes/audit/webhook.yaml
{{- end }}
{{- if .kubernetes.apiserver.extra_args | empty | not }}
{{ kubeExtraArgs .kubernetes.apiserver.extra_args | toYaml | indent 4 }}
{{ mapToNamedStringArgs .kubernetes.apiserver.extra_args | toYaml | indent 4 }}
{{- end }}
certSANs:
- localhost
@ -143,7 +143,7 @@ controllerManager:
{{- end }}
{{- end }}
{{- if .kubernetes.controller_manager.extra_args }}
{{ kubeExtraArgs .kubernetes.controller_manager.extra_args | toYaml | indent 4 }}
{{ mapToNamedStringArgs .kubernetes.controller_manager.extra_args | toYaml | indent 4 }}
{{- end }}
extraVolumes:
- name: host-time
@ -172,7 +172,7 @@ scheduler:
{{- end }}
{{- end }}
{{- if .kubernetes.scheduler.extra_args }}
{{ kubeExtraArgs .kubernetes.scheduler.extra_args | toYaml | indent 4 }}
{{ mapToNamedStringArgs .kubernetes.scheduler.extra_args | toYaml | indent 4 }}
{{- end }}
---
apiVersion: kubeadm.k8s.io/v1beta4

6
pkg/converter/tmpl/functions.go
View File

@ -33,7 +33,7 @@ func funcMap() template.FuncMap {
f["fileExist"] = fileExist
f["unquote"] = unquote
f["getStringSlice"] = getStringSlice
f["kubeExtraArgs"] = kubeExtraArgs
f["mapToNamedStringArgs"] = mapToNamedStringArgs
return f
}
@ -143,9 +143,9 @@ func getStringSlice(d map[string][]string, key string) []string {
return nil
}
// kubeExtraArgs make kubeadm extra args of v1/beta4
// mapToNamedStringArgs make kubeadm extra args of v1/beta4
// for string/string extra argument maps, convert to structured extra arguments
func kubeExtraArgs(input any) []map[string]string {
func mapToNamedStringArgs(input any) []map[string]string {
v := reflect.ValueOf(input)
if v.Kind() != reflect.Map {
return []map[string]string{}

2
pkg/converter/tmpl/template_test.go
View File

@ -264,7 +264,7 @@ func TestParseValue(t *testing.T) {
},
{
name: "make kubeadm extra args from map",
input: "{{ kubeExtraArgs .foo | toYaml }}",
input: "{{ mapToNamedStringArgs .foo | toYaml }}",
variable: map[string]any{
"foo": map[string]any{
"foo": "bar1",