Merge pull request #7319 from lcrisci/fix-template-clustername-behavior

Fix template clusterName behavior
kubernetes · Jan 28, 2020 · b962354 · b962354
2 parents e56c507 + 970c978
commit b962354
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/cmd/kops/toolbox_template.go b/cmd/kops/toolbox_template.go
@@ -111,7 +111,14 @@ func runToolBoxTemplate(f *util.Factory, out io.Writer, options *toolboxTemplate
 	if err != nil {
 		return err
 	}
-	context["clusterName"] = options.clusterName
+
+	// @step: set clusterName from template's values or cli flag
+	value, ok := context["clusterName"].(string)
+	if ok {
+		options.clusterName = value
+	} else {
+		context["clusterName"] = options.clusterName
+	}
 
 	// @check if we are just rendering the config value
 	if options.configValue != "" {