Extra arguments need to be quoted

kubernetes · Oct 11, 2017 · 967913b · 967913b
1 parent dd50d76
commit 967913b
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 16 deletions.
diff --git a/pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go b/pkg/minikube/bootstrapper/kubeadm/kubeadm_test.go
@@ -89,11 +89,11 @@ etcd:
   dataDir: /data
 nodeName: extra-args-minikube
 apiServerExtraArgs:
-  fail-no-swap: true
+  fail-no-swap: "true"
 controllerManagerExtraArgs:
-  kube-api-burst: 32
+  kube-api-burst: "32"
 schedulerExtraArgs:
-  scheduler-name: mini-scheduler
+  scheduler-name: "mini-scheduler"
 `,
 		},
 		{
@@ -128,8 +128,8 @@ etcd:
   dataDir: /data
 nodeName: extra-args-minikube
 apiServerExtraArgs:
-  fail-no-swap: true
-  kube-api-burst: 32
+  fail-no-swap: "true"
+  kube-api-burst: "32"
 `,
 		},
 		{
@@ -153,11 +153,11 @@ etcd:
   dataDir: /data
 nodeName: extra-args-minikube
 apiServerExtraArgs:
-  feature-gates: HugePages=true,OtherFeature=false
+  feature-gates: "HugePages=true,OtherFeature=false"
 controllerManagerExtraArgs:
-  feature-gates: HugePages=true,OtherFeature=false
+  feature-gates: "HugePages=true,OtherFeature=false"
 schedulerExtraArgs:
-  feature-gates: HugePages=true,OtherFeature=false
+  feature-gates: "HugePages=true,OtherFeature=false"
 `,
 		},
 		{
@@ -188,12 +188,12 @@ etcd:
   dataDir: /data
 nodeName: extra-args-minikube
 apiServerExtraArgs:
-  fail-no-swap: true
-  feature-gates: HugePages=true,OtherFeature=false
+  fail-no-swap: "true"
+  feature-gates: "HugePages=true,OtherFeature=false"
 controllerManagerExtraArgs:
-  feature-gates: HugePages=true,OtherFeature=false
+  feature-gates: "HugePages=true,OtherFeature=false"
 schedulerExtraArgs:
-  feature-gates: HugePages=true,OtherFeature=false
+  feature-gates: "HugePages=true,OtherFeature=false"
 `,
 		},
 		{

diff --git a/pkg/minikube/bootstrapper/kubeadm/templates.go b/pkg/minikube/bootstrapper/kubeadm/templates.go
@@ -18,8 +18,8 @@ package kubeadm
 
 import (
 	"fmt"
-	"html/template"
 	"sort"
+	"text/template"
 )
 
 var kubeadmConfigTemplate = template.Must(template.New("kubeadmConfigTemplate").Funcs(template.FuncMap{
@@ -89,7 +89,7 @@ func printMapInOrder(m map[string]string, sep string) []string {
 	}
 	sort.Strings(keys)
 	for i, k := range keys {
-		keys[i] = fmt.Sprintf("%s%s%s", k, sep, m[k])
+		keys[i] = fmt.Sprintf("%s%s\"%s\"", k, sep, m[k])
 	}
 	return keys
 }
diff --git a/pkg/minikube/bootstrapper/kubeadm/templates_test.go b/pkg/minikube/bootstrapper/kubeadm/templates_test.go
@@ -34,7 +34,7 @@ func TestPrintMapInOrder(t *testing.T) {
 			m: map[string]string{
 				"a": "1",
 			},
-			expected: []string{"a: 1"},
+			expected: []string{`a: "1"`},
 		},
 		{
 			description: "two kv",
@@ -43,7 +43,7 @@ func TestPrintMapInOrder(t *testing.T) {
 				"b": "2",
 				"a": "1",
 			},
-			expected: []string{"a=1", "b=2"},
+			expected: []string{`a="1"`, `b="2"`},
 		},
 		{
 			description: "no kv",

diff --git a/pkg/minikube/bootstrapper/kubeadm/versions.go b/pkg/minikube/bootstrapper/kubeadm/versions.go
@@ -65,6 +65,8 @@ var componentToKubeadmConfigKey = map[string]string{
 	Apiserver:         "apiServerExtraArgs",
 	ControllerManager: "controllerManagerExtraArgs",
 	Scheduler:         "schedulerExtraArgs",
+	// The Kubelet is not configured in kubeadm, only in systemd.
+	Kubelet: "",
 }
 
 func NewComponentExtraArgs(opts util.ExtraOptionSlice, version semver.Version, featureGates string) ([]ComponentExtraArgs, error) {
@@ -83,6 +85,9 @@ func NewComponentExtraArgs(opts util.ExtraOptionSlice, version semver.Version, f
 
 	for _, component := range keys {
 		kubeadmComponentKey := componentToKubeadmConfigKey[component]
+		if kubeadmComponentKey == "" {
+			continue
+		}
 		extraConfig, err := ExtraConfigForComponent(component, opts, version)
 		if err != nil {
 			return nil, errors.Wrapf(err, "getting kubeadm extra args for %s", component)