Merge pull request kubernetes#76201 from mrueg/flags-fix

k8s-ci-robot · web-flow · commit e47fc04adc39 · 2019-04-08T05:44:28.000-07:00
kubeadm: Quote values in envFile
diff --git a/cmd/kubeadm/app/phases/kubelet/flags.go b/cmd/kubeadm/app/phases/kubelet/flags.go
@@ -63,7 +63,7 @@ func WriteKubeletDynamicEnvFile(cfg *kubeadmapi.ClusterConfiguration, nodeReg *k
 	}
 	stringMap := buildKubeletArgMap(flagOpts)
 	argList := kubeadmutil.BuildArgumentListFromMap(stringMap, nodeReg.KubeletExtraArgs)
-	envFileContent := fmt.Sprintf("%s=%s\n", constants.KubeletEnvFileVariableName, strings.Join(argList, " "))
+	envFileContent := fmt.Sprintf("%s=%q\n", constants.KubeletEnvFileVariableName, strings.Join(argList, " "))
 
 	return writeKubeletFlagBytesToDisk([]byte(envFileContent), kubeletDir)
 }

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ func WriteKubeletDynamicEnvFile(cfg kubeadmapi.ClusterConfiguration, nodeReg k`
`63`	`63`	`}`
`64`	`64`	`stringMap := buildKubeletArgMap(flagOpts)`
`65`	`65`	`argList := kubeadmutil.BuildArgumentListFromMap(stringMap, nodeReg.KubeletExtraArgs)`
`66`		`- envFileContent := fmt.Sprintf("%s=%s\n", constants.KubeletEnvFileVariableName, strings.Join(argList, " "))`
	`66`	`+ envFileContent := fmt.Sprintf("%s=%q\n", constants.KubeletEnvFileVariableName, strings.Join(argList, " "))`
`67`	`67`
`68`	`68`	`return writeKubeletFlagBytesToDisk([]byte(envFileContent), kubeletDir)`
`69`	`69`	`}`