diff --git a/builtin/core/roles/kubernetes/init-kubernetes/templates/kubeadm/kubeadm-init.v1beta4 b/builtin/core/roles/kubernetes/init-kubernetes/templates/kubeadm/kubeadm-init.v1beta4 index 3d0514bd..da15281b 100644 --- a/builtin/core/roles/kubernetes/init-kubernetes/templates/kubeadm/kubeadm-init.v1beta4 +++ b/builtin/core/roles/kubernetes/init-kubernetes/templates/kubeadm/kubeadm-init.v1beta4 @@ -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 diff --git a/pkg/converter/tmpl/functions.go b/pkg/converter/tmpl/functions.go index 767691bb..c0149be2 100644 --- a/pkg/converter/tmpl/functions.go +++ b/pkg/converter/tmpl/functions.go @@ -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{} diff --git a/pkg/converter/tmpl/template_test.go b/pkg/converter/tmpl/template_test.go index d54716a5..1eb3b253 100644 --- a/pkg/converter/tmpl/template_test.go +++ b/pkg/converter/tmpl/template_test.go @@ -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",