Merge pull request #741 from bskiba/fix-kube-env

Fix for multi line KUBELET_ARGS
kubernetes · Mar 22, 2018 · d3cbc86 · d3cbc86
2 parents e8aeb60 + 060c122
commit d3cbc86
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/cluster-autoscaler/cloudprovider/gce/templates.go b/cluster-autoscaler/cloudprovider/gce/templates.go
@@ -420,6 +420,8 @@ func extractAutoscalerVarFromKubeEnv(kubeEnv, name string) ([]string, error) {
 func extractFromKubeEnv(kubeEnv, resource string) ([]string, error) {
 	result := make([]string, 0)
 
+	kubeEnv = strings.Replace(kubeEnv, "\n ", " ", -1)
+
 	for line, env := range strings.Split(kubeEnv, "\n") {
 		env = strings.Trim(env, " ")
 		if len(env) == 0 {