Removed old conf var

clitools/pkg/templates/templates.go

@@ -21,8 +21,8 @@ func DefaultMonoKSConfig(v TemplateValues) types.MonoKSConfig {
 			KubernetesVersion: v.KubernetesVersion,
 			NodeName:          firstNonEmpty(v.NodeName, v.Hostname),
 
-			ClusterRole:      clusterRoleFromTemplateValues(v),
-			InitControlPlane: initControlPlaneFromTemplateValues(v),
+			ClusterRole:      v.ClusterRole,
+			InitControlPlane: v.InitControlPlane,
 
 			ClusterName:   v.ClusterName,
 			ClusterDomain: v.ClusterDomain,
@@ -84,24 +84,6 @@ func DefaultOSUpgrade(v TemplateValues) types.OSUpgrade {
 	}
 }
 
-func clusterRoleFromTemplateValues(v TemplateValues) string {
-	switch strings.ToLower(strings.TrimSpace(v.BootstrapMode)) {
-	case "init":
-		return "control-plane"
-	case "join":
-		if strings.EqualFold(strings.TrimSpace(v.JoinKind), "control-plane") {
-			return "control-plane"
-		}
-		return "worker"
-	default:
-		return "control-plane"
-	}
-}
-
-func initControlPlaneFromTemplateValues(v TemplateValues) bool {
-	return strings.EqualFold(strings.TrimSpace(v.BootstrapMode), "init")
-}
-
 func firstNonEmpty(xs ...string) string {
 	for _, x := range xs {
 		if strings.TrimSpace(x) != "" {
@@ -129,4 +111,4 @@ func copyStringMap(in map[string]string) map[string]string {
 		out[k] = v
 	}
 	return out
-}
+}