From a6b55093b0368fcdbf03db244d7c9f93ae6faf00 Mon Sep 17 00:00:00 2001
From: Yongxiang Gao <ygao@armada.ai>
Date: Sat, 30 Mar 2024 10:34:17 -0700
Subject: [PATCH] Improve eksctl-anywhere cluster config generation with
 parameters for bare metal and vSphere

Sample command for bare metal is:
    eksctl anywhere generate clusterconfig <cluster name> \
        -p tinkerbell \
        -m params_tinkerbell.yaml

Sample params_tinkerbell.yaml has content:
"""
managementClusterName: <management cluster name>
podsCidrBlocks:
  - 192.168.64.0/18
servicesCidrBlocks:
  - 10.96.0.0/12
kubernetesVersion: 1.26
cpCount: 1
workerCount: 2
cpEndpointHost: <control plane endpoint host ip>
tinkerbellIP: <tinkerbellIP>
adminIP: <admin machine ip>
osFamily: ubuntu
osImageURL: <osImageURL of K8s 1.26>
hardwareCSV: <hardware CSV file>
sshAuthorizedKeyFile: <sshKey.pub file>
tinkerbellTemplateConfigTemplateFile: tinkerbellTemplateConfigTemplateUbuntu.yaml
"""

managementClusterName is optional, the default value is <cluster name>
tinkerbellTemplateConfigTemplateFile is for advanced use cases, the default ("") is ok to use

Sample command for vSphere is:
    eksctl anywhere generate clusterconfig <cluster name>
        -p vsphere
        -m params_vsphere.yaml

Sample params_vsphere.yaml has content:
"""
managementClusterName: <management cluster name>
podsCidrBlocks:
  - 192.168.192.0/18
servicesCidrBlocks:
  - 10.96.192.0/18
cpCount: 2
etcdCount: 3
workerCount: 3
cpEndpointHost: <control plane endpoint host ip>
kubernetesVersion: 1.28
datacenter: <vDatacenter>
insecure: true
network: <vCenterNetwork>
server: <serverIP>
thumbprint: <thumprint>
datastore: <vDatastore>
folder: <folder>
cpDiskGiB: 0
cpMemoryMiB: 0
cpNumCPUs: 0
etcdDiskGiB: 0
etcdMemoryMiB: 0
etcdNumCPUs: 0
workerDiskGiB: 256
workerMemoryMiB: 65536
workerNumCPUs: 16
osFamily: "ubuntu"
resourcePool: <resource pool>
template: <template name of OS>
sshAuthorizedKeyFile: <sshKey.pub>
"""

managementClusterName is optional, the default value is <cluster name>
---
 .../cmd/generateclusterconfig.go              | 271 ++++++++++++++++--
 .../cmd/tinkerbellparams_defaults_template.go |  26 ++
 ...teconfig_defaults_template_bottlerocket.go |  94 ++++++
 ...templateconfig_defaults_template_ubuntu.go | 116 ++++++++
 .../cmd/vsphereparams_defaults_template.go    |  40 +++
 pkg/api/v1alpha1/cluster.go                   |  58 +++-
 pkg/api/v1alpha1/cluster_test.go              |  12 +-
 pkg/api/v1alpha1/cluster_types.go             |   5 +
 pkg/api/v1alpha1/conditional_functions.go     |  37 +++
 .../tinkerbellclusterconfigparams_types.go    |  21 ++
 .../v1alpha1/tinkerbelldatacenterconfig.go    |   7 +-
 pkg/api/v1alpha1/tinkerbellmachineconfig.go   |   9 +-
 .../vsphereclusterconfigparams_types.go       |  35 +++
 pkg/api/v1alpha1/vspheredatacenterconfig.go   |  10 +-
 pkg/api/v1alpha1/vspheremachineconfig.go      |  16 +-
 15 files changed, 709 insertions(+), 48 deletions(-)
 create mode 100644 cmd/eksctl-anywhere/cmd/tinkerbellparams_defaults_template.go
 create mode 100644 cmd/eksctl-anywhere/cmd/tinkerbelltemplateconfig_defaults_template_bottlerocket.go
 create mode 100644 cmd/eksctl-anywhere/cmd/tinkerbelltemplateconfig_defaults_template_ubuntu.go
 create mode 100644 cmd/eksctl-anywhere/cmd/vsphereparams_defaults_template.go
 create mode 100644 pkg/api/v1alpha1/conditional_functions.go
 create mode 100644 pkg/api/v1alpha1/tinkerbellclusterconfigparams_types.go
 create mode 100644 pkg/api/v1alpha1/vsphereclusterconfigparams_types.go

diff --git a/cmd/eksctl-anywhere/cmd/generateclusterconfig.go b/cmd/eksctl-anywhere/cmd/generateclusterconfig.go
index 78ce9302dd47..10e13834f849 100644
--- a/cmd/eksctl-anywhere/cmd/generateclusterconfig.go
+++ b/cmd/eksctl-anywhere/cmd/generateclusterconfig.go
@@ -1,8 +1,10 @@
 package cmd
 
 import (
+	"encoding/csv"
 	"fmt"
 	"log"
+	"os"
 	"strings"
 
 	"github.com/spf13/cobra"
@@ -50,6 +52,7 @@ func preRunGenerateClusterConfig(cmd *cobra.Command, args []string) {
 func init() {
 	generateCmd.AddCommand(generateClusterConfigCmd)
 	generateClusterConfigCmd.Flags().StringP("provider", "p", "", fmt.Sprintf("Provider to use (%s)", strings.Join(constants.SupportedProviders, " or ")))
+	generateClusterConfigCmd.Flags().StringP("paramsFile", "m", "", "parameters file (vsphere or tinkerbell)")
 	err := generateClusterConfigCmd.MarkFlagRequired("provider")
 	if err != nil {
 		log.Fatalf("marking flag as required: %v", err)
@@ -61,6 +64,34 @@ func generateClusterConfig(clusterName string) error {
 	var datacenterYaml []byte
 	var machineGroupYaml [][]byte
 	var clusterConfigOpts []v1alpha1.ClusterGenerateOpt
+	var kubernetesVersion string
+	var tinkerbellTemplateConfigTemplate string
+	var podsCidrBlocks []string
+	var servicesCidrBlocks []string
+	var paramsData []byte
+	var err error
+
+	// use cluster name as the default management cluster name.
+	managementClusterName := clusterName
+
+	if viper.IsSet("paramsFile") {
+		paramsFile := viper.GetString("paramsFile")
+		paramsData, err = os.ReadFile(paramsFile)
+
+		switch strings.ToLower(viper.GetString("provider")) {
+		case constants.VSphereProviderName:
+			if err != nil {
+				return fmt.Errorf("reading paramsFile: %v\nSample paramsFile has content:\n%s", err, GetDefaultVSphereParamsTemplate())
+			}
+		case constants.TinkerbellProviderName:
+			if err != nil {
+				return fmt.Errorf("reading paramsFile: %v\nSample paramsFile has content:\n%s", err, GetDefaultTinkerbellParamsTemplate())
+			}
+		default:
+			return fmt.Errorf("parameter file is only supported for vsphere and tinkerbell")
+		}
+	}
+
 	switch strings.ToLower(viper.GetString("provider")) {
 	case constants.DockerProviderName:
 		datacenterConfig := v1alpha1.NewDockerDatacenterConfigGenerate(clusterName)
@@ -77,13 +108,54 @@ func generateClusterConfig(clusterName string) error {
 		}
 		datacenterYaml = dcyaml
 	case constants.VSphereProviderName:
-		clusterConfigOpts = append(clusterConfigOpts, v1alpha1.WithClusterEndpoint())
-		datacenterConfig := v1alpha1.NewVSphereDatacenterConfigGenerate(clusterName)
+		var vSphereParams v1alpha1.VSphereClusterConfigParams
+		err = yaml.Unmarshal(paramsData, &vSphereParams)
+		if err != nil {
+			return fmt.Errorf("unmarshal vSphereParams: %v", err)
+		}
+
+		if vSphereParams.ManagementClusterName != "" {
+			// override the management cluster name with that from parameter file.
+			managementClusterName = vSphereParams.ManagementClusterName
+		}
+
+		// set podsCidrBlocks and servicesCidrBlocks to the values from parameter file.
+		podsCidrBlocks = vSphereParams.PodsCidrBlocks
+		servicesCidrBlocks = vSphereParams.ServicesCidrBlocks
+
+		if vSphereParams.CPEndpointHost != "" {
+			// add control plane endpoint config with host from parameter file.
+			clusterConfigOpts = append(clusterConfigOpts, v1alpha1.WithClusterEndpointHost(vSphereParams.CPEndpointHost))
+		} else {
+			clusterConfigOpts = append(clusterConfigOpts, v1alpha1.WithClusterEndpoint())
+		}
+
+		// create datacenter config with values from parameter file
+		datacenterConfig := v1alpha1.NewVSphereDatacenterConfigGenerate(clusterName, vSphereParams.Datacenter, vSphereParams.Network, vSphereParams.Server, vSphereParams.Thumbprint, vSphereParams.Insecure)
 		clusterConfigOpts = append(clusterConfigOpts, v1alpha1.WithDatacenterRef(datacenterConfig))
+		// default counts of CP nodes, Etcd nodes and worker nodes.
+		cpCount := 2
+		etcdCount := 3
+		workerCount := 2
+
+		if vSphereParams.CPCount != 0 {
+			// override counts of CP nodes with value from parameter file.
+			cpCount = vSphereParams.CPCount
+		}
+
+		if vSphereParams.EtcdCount != 0 {
+			// override counts of Etcd nodes with value from parameter file.
+			etcdCount = vSphereParams.EtcdCount
+		}
+
+		if vSphereParams.WorkerCount != 0 {
+			// override counts of Worker nodes with value from parameter file.
+			workerCount = vSphereParams.WorkerCount
+		}
 		clusterConfigOpts = append(clusterConfigOpts,
-			v1alpha1.ControlPlaneConfigCount(2),
-			v1alpha1.ExternalETCDConfigCount(3),
-			v1alpha1.WorkerNodeConfigCount(2),
+			v1alpha1.ControlPlaneConfigCount(cpCount),
+			v1alpha1.ExternalETCDConfigCount(etcdCount),
+			v1alpha1.WorkerNodeConfigCount(workerCount),
 			v1alpha1.WorkerNodeConfigName(constants.DefaultWorkerNodeGroupName),
 		)
 		dcyaml, err := yaml.Marshal(datacenterConfig)
@@ -91,11 +163,21 @@ func generateClusterConfig(clusterName string) error {
 			return fmt.Errorf("generating cluster yaml: %v", err)
 		}
 		datacenterYaml = dcyaml
+		var sshAuthorizedKey string
+		if vSphereParams.SSHAuthorizedKeyFile != "" {
+			b, err := os.ReadFile(vSphereParams.SSHAuthorizedKeyFile)
+			if err != nil {
+				return fmt.Errorf("open sshAuthorizedKeyFile file: %v", err)
+			}
+			sshAuthorizedKey = string(b)
+		}
+
+		kubernetesVersion = vSphereParams.KubernetesVersion
 		// need to default control plane config name to something different from the cluster name based on assumption
 		// in controller code
-		cpMachineConfig := v1alpha1.NewVSphereMachineConfigGenerate(providers.GetControlPlaneNodeName(clusterName))
-		workerMachineConfig := v1alpha1.NewVSphereMachineConfigGenerate(clusterName)
-		etcdMachineConfig := v1alpha1.NewVSphereMachineConfigGenerate(providers.GetEtcdNodeName(clusterName))
+		cpMachineConfig := v1alpha1.NewVSphereMachineConfigGenerate(providers.GetControlPlaneNodeName(clusterName), vSphereParams.Datastore, vSphereParams.Folder, vSphereParams.ResourcePool, vSphereParams.Template, sshAuthorizedKey, vSphereParams.OSFamily, vSphereParams.CPDiskGiB, vSphereParams.CPNumCPUs, vSphereParams.CPMemoryMiB)
+		workerMachineConfig := v1alpha1.NewVSphereMachineConfigGenerate(clusterName, vSphereParams.Datastore, vSphereParams.Folder, vSphereParams.ResourcePool, vSphereParams.Template, sshAuthorizedKey, vSphereParams.OSFamily, vSphereParams.WorkerDiskGiB, vSphereParams.WorkerNumCPUs, vSphereParams.WorkerMemoryMiB)
+		etcdMachineConfig := v1alpha1.NewVSphereMachineConfigGenerate(providers.GetEtcdNodeName(clusterName), vSphereParams.Datastore, vSphereParams.Folder, vSphereParams.ResourcePool, vSphereParams.Template, sshAuthorizedKey, vSphereParams.OSFamily, vSphereParams.EtcdDiskGiB, vSphereParams.EtcdNumCPUs, vSphereParams.EtcdMemoryMiB)
 		clusterConfigOpts = append(clusterConfigOpts,
 			v1alpha1.WithCPMachineGroupRef(cpMachineConfig),
 			v1alpha1.WithWorkerMachineGroupRef(workerMachineConfig),
@@ -183,35 +265,172 @@ func generateClusterConfig(clusterName string) error {
 		}
 		machineGroupYaml = append(machineGroupYaml, cpMcYaml, workerMcYaml, etcdMcYaml)
 	case constants.TinkerbellProviderName:
-		clusterConfigOpts = append(clusterConfigOpts, v1alpha1.WithClusterEndpoint())
-		datacenterConfig := v1alpha1.NewTinkerbellDatacenterConfigGenerate(clusterName)
+		var tinkerbellParams v1alpha1.TinkerbellClusterConfigParams
+		err = yaml.Unmarshal(paramsData, &tinkerbellParams)
+		if err != nil {
+			return fmt.Errorf("unmarshal tinkerbellParams: %v", err)
+		}
+
+		if tinkerbellParams.ManagementClusterName != "" {
+			// override the management cluster name with that from parameter file.
+			managementClusterName = tinkerbellParams.ManagementClusterName
+		}
+
+		// set podsCidrBlocks and servicesCidrBlocks to the values from parameter file.
+		podsCidrBlocks = tinkerbellParams.PodsCidrBlocks
+		servicesCidrBlocks = tinkerbellParams.ServicesCidrBlocks
+
+		if tinkerbellParams.CPEndpointHost != "" {
+			// add control plane endpoint config with host from parameter file.
+			clusterConfigOpts = append(clusterConfigOpts, v1alpha1.WithClusterEndpointHost(tinkerbellParams.CPEndpointHost))
+		} else {
+			clusterConfigOpts = append(clusterConfigOpts, v1alpha1.WithClusterEndpoint())
+		}
+
+		kubernetesVersion = tinkerbellParams.KubernetesVersion
+
+		adminIP := tinkerbellParams.AdminIP
+		tinkerbellIP := tinkerbellParams.TinkerbellIP
+		osImageURL := tinkerbellParams.OSImageURL
+
+		// create datacenter config with values from parameter file
+		datacenterConfig := v1alpha1.NewTinkerbellDatacenterConfigGenerate(clusterName, tinkerbellIP, osImageURL)
 		clusterConfigOpts = append(clusterConfigOpts, v1alpha1.WithDatacenterRef(datacenterConfig))
+		// default counts of CP nodes, Etcd nodes and worker nodes.
+		cpCount := 1
+		workerCount := 1
+		if tinkerbellParams.HardwareCSV != "" {
+			// parse hardware.csv file to get counts of CP/worker nodes
+			f, err := os.Open(tinkerbellParams.HardwareCSV)
+			if err != nil {
+				return fmt.Errorf("open hardware file: %v", err)
+			}
+			defer f.Close()
+			csvReader := csv.NewReader(f)
+			data, err := csvReader.ReadAll()
+			if err != nil {
+				return fmt.Errorf("read hardware file: %v", err)
+			}
+			macIndex := -1
+			ipIndex := -1
+			labelsIndex := -1
+			cpCount = 0
+			workerCount = 0
+			for i, line := range data {
+				if i == 0 {
+					// from the header (first line), find the index of
+					// MAC, IP, labels.
+					for j, field := range line {
+						if strings.EqualFold(field, "mac") {
+							macIndex = j
+						} else if strings.EqualFold(field, "ip_address") {
+							ipIndex = j
+						} else if strings.EqualFold(field, "labels") {
+							labelsIndex = j
+						}
+					}
+					if macIndex == -1 {
+						return fmt.Errorf("no mac header found in hardware file")
+					}
+					if ipIndex == -1 {
+						return fmt.Errorf("no ip header found in hardware file")
+					}
+					if labelsIndex == -1 {
+						return fmt.Errorf("no labels header found in hardware file")
+					}
+				} else {
+					// for rest lines, increase counts of CP nodes and worker nodes.
+					if strings.ToLower(line[labelsIndex]) == "type=cp" {
+						cpCount = cpCount + 1
+					} else {
+						workerCount = workerCount + 1
+					}
+				}
+			}
+		}
+
+		if tinkerbellParams.CPCount != 0 {
+			// override counts of CP nodes with value from parameter file.
+			cpCount = tinkerbellParams.CPCount
+		}
+
+		if tinkerbellParams.WorkerCount != 0 {
+			// override counts of Worker nodes with value from parameter file.
+			workerCount = tinkerbellParams.WorkerCount
+		}
+
 		clusterConfigOpts = append(clusterConfigOpts,
-			v1alpha1.ControlPlaneConfigCount(1),
-			v1alpha1.WorkerNodeConfigCount(1),
-			v1alpha1.WorkerNodeConfigName(constants.DefaultWorkerNodeGroupName),
+			v1alpha1.ControlPlaneConfigCount(cpCount),
 		)
+		if workerCount > 0 {
+			// only generate worker cluster when worker count > 0.
+			clusterConfigOpts = append(clusterConfigOpts,
+				v1alpha1.WorkerNodeConfigCount(workerCount),
+				v1alpha1.WorkerNodeConfigName(constants.DefaultWorkerNodeGroupName),
+			)
+		}
 		dcyaml, err := yaml.Marshal(datacenterConfig)
 		if err != nil {
 			return fmt.Errorf("generating cluster yaml: %v", err)
 		}
 		datacenterYaml = dcyaml
 
-		cpMachineConfig := v1alpha1.NewTinkerbellMachineConfigGenerate(providers.GetControlPlaneNodeName(clusterName))
-		workerMachineConfig := v1alpha1.NewTinkerbellMachineConfigGenerate(clusterName)
+		var sshAuthorizedKey string
+		if tinkerbellParams.SSHAuthorizedKeyFile != "" {
+			b, err := os.ReadFile(tinkerbellParams.SSHAuthorizedKeyFile)
+			if err != nil {
+				return fmt.Errorf("open sshAuthorizedKeyFile file: %v", err)
+			}
+			sshAuthorizedKey = string(b)
+		}
+
+		cpMachineConfig := v1alpha1.NewTinkerbellMachineConfigGenerate(clusterName, providers.GetControlPlaneNodeName(clusterName), "cp", sshAuthorizedKey, tinkerbellParams.OSFamily)
 		clusterConfigOpts = append(clusterConfigOpts,
 			v1alpha1.WithCPMachineGroupRef(cpMachineConfig),
-			v1alpha1.WithWorkerMachineGroupRef(workerMachineConfig),
 		)
 		cpMcYaml, err := yaml.Marshal(cpMachineConfig)
 		if err != nil {
 			return fmt.Errorf("generating cluster yaml: %v", err)
 		}
-		workerMcYaml, err := yaml.Marshal(workerMachineConfig)
-		if err != nil {
-			return fmt.Errorf("generating cluster yaml: %v", err)
+		machineGroupYaml = append(machineGroupYaml, cpMcYaml)
+
+		if workerCount > 0 {
+			workerMachineConfig := v1alpha1.NewTinkerbellMachineConfigGenerate(clusterName, clusterName, "worker", sshAuthorizedKey, tinkerbellParams.OSFamily)
+			// only generate worker machine group reference when worker count > 0.
+			clusterConfigOpts = append(clusterConfigOpts,
+				v1alpha1.WithWorkerMachineGroupRef(workerMachineConfig),
+			)
+			// only generate worker machine config YAML when worker count > 0.
+			workerMcYaml, err := yaml.Marshal(workerMachineConfig)
+			if err != nil {
+				return fmt.Errorf("generating cluster yaml: %v", err)
+			}
+			machineGroupYaml = append(machineGroupYaml, workerMcYaml)
+		}
+
+		if viper.IsSet("paramsFile") {
+			if tinkerbellParams.TinkerbellTemplateConfigTemplateFile != "" {
+				b, err := os.ReadFile(tinkerbellParams.TinkerbellTemplateConfigTemplateFile)
+				if err != nil {
+					if tinkerbellParams.OSFamily == v1alpha1.Ubuntu {
+						return fmt.Errorf("open tinkerbellTemplateConfigTemplateFile file: %v\nSample TinkerbellTemplateConfigTemplateFile has content:%s", err, GetDefaultTinkerbellTemplateConfigTemplateUbuntu())
+					} else if tinkerbellParams.OSFamily == v1alpha1.Bottlerocket {
+						return fmt.Errorf("open tinkerbellTemplateConfigTemplateFile file: %v\nSample TinkerbellTemplateConfigTemplateFile has content:%s", err, GetDefaultTinkerbellTemplateConfigTemplateBottlerocket())
+					}
+					return fmt.Errorf("open tinkerbellTemplateConfigTemplateFile file: %v", err)
+				}
+				tinkerbellTemplateConfigTemplate = string(b)
+			} else if tinkerbellParams.OSFamily == v1alpha1.Ubuntu {
+				tinkerbellTemplateConfigTemplate = GetDefaultTinkerbellTemplateConfigTemplateUbuntu()
+			} else if tinkerbellParams.OSFamily == v1alpha1.Bottlerocket {
+				tinkerbellTemplateConfigTemplate = GetDefaultTinkerbellTemplateConfigTemplateBottlerocket()
+			}
+
+			tinkerbellTemplateConfigTemplate = strings.Replace(tinkerbellTemplateConfigTemplate, "$$NAME", clusterName, -1)
+			tinkerbellTemplateConfigTemplate = strings.Replace(tinkerbellTemplateConfigTemplate, "$$IMG_URL", osImageURL, -1)
+			tinkerbellTemplateConfigTemplate = strings.Replace(tinkerbellTemplateConfigTemplate, "$$ADMIN_IP", adminIP, -1)
+			tinkerbellTemplateConfigTemplate = strings.Replace(tinkerbellTemplateConfigTemplate, "$$TINKERBELL_IP", tinkerbellIP, -1)
 		}
-		machineGroupYaml = append(machineGroupYaml, cpMcYaml, workerMcYaml)
 	case constants.NutanixProviderName:
 		datacenterConfig := v1alpha1.NewNutanixDatacenterConfigGenerate(clusterName)
 		dcYaml, err := yaml.Marshal(datacenterConfig)
@@ -257,7 +476,8 @@ func generateClusterConfig(clusterName string) error {
 	default:
 		return fmt.Errorf("not a valid provider")
 	}
-	config := v1alpha1.NewClusterGenerate(clusterName, clusterConfigOpts...)
+
+	config := v1alpha1.NewClusterGenerate(clusterName, managementClusterName, kubernetesVersion, podsCidrBlocks, servicesCidrBlocks, clusterConfigOpts...)
 
 	configMarshal, err := yaml.Marshal(config)
 	if err != nil {
@@ -272,6 +492,13 @@ func generateClusterConfig(clusterName string) error {
 		resources = append(resources, machineGroupYaml...)
 	}
 
-	fmt.Println(string(templater.AppendYamlResources(resources...)))
+	fmt.Print(string(templater.AppendYamlResources(resources...)))
+
+	if tinkerbellTemplateConfigTemplate != "" {
+		fmt.Println(tinkerbellTemplateConfigTemplate)
+	} else {
+		fmt.Println("")
+	}
+
 	return nil
 }
diff --git a/cmd/eksctl-anywhere/cmd/tinkerbellparams_defaults_template.go b/cmd/eksctl-anywhere/cmd/tinkerbellparams_defaults_template.go
new file mode 100644
index 000000000000..a121b9ce82f0
--- /dev/null
+++ b/cmd/eksctl-anywhere/cmd/tinkerbellparams_defaults_template.go
@@ -0,0 +1,26 @@
+package cmd
+
+const (
+	defaultTinkerbellParamsTemplate = `managementClusterName: <management cluster name>
+podsCidrBlocks:
+  - 192.168.64.0/18
+servicesCidrBlocks:
+  - 10.96.0.0/12
+kubernetesVersion: 1.26
+cpCount: 1
+workerCount: 2
+cpEndpointHost: <control plane endpoint host ip>
+tinkerbellIP: <tinkerbellIP>
+adminIP: <admin machine ip>
+osFamily: ubuntu
+osImageURL: <osImageURL of K8s 1.26>
+hardwareCSV: <hardware CSV file>
+sshAuthorizedKeyFile: <sshKey.pub file>
+tinkerbellTemplateConfigTemplateFile: tinkerbellTemplateConfigTemplate.yaml
+`
+)
+
+// GetDefaultTinkerbellParamsTemplate returns the default TinkerbellParamsTemplate.
+func GetDefaultTinkerbellParamsTemplate() string {
+	return string(defaultTinkerbellParamsTemplate)
+}
diff --git a/cmd/eksctl-anywhere/cmd/tinkerbelltemplateconfig_defaults_template_bottlerocket.go b/cmd/eksctl-anywhere/cmd/tinkerbelltemplateconfig_defaults_template_bottlerocket.go
new file mode 100644
index 000000000000..bf767ac78eb0
--- /dev/null
+++ b/cmd/eksctl-anywhere/cmd/tinkerbelltemplateconfig_defaults_template_bottlerocket.go
@@ -0,0 +1,94 @@
+package cmd
+
+const (
+	defaultTinkerbellTemplateConfigTemplateBottlerocket = `apiVersion: anywhere.eks.amazonaws.com/v1alpha1
+kind: TinkerbellTemplateConfig
+metadata:
+  name: $$NAME
+spec:
+  template:
+    global_timeout: 6000
+    id: ""
+    name: $$NAME
+    tasks:
+    - actions:
+      - environment:
+          COMPRESSED: "true"
+          DEST_DISK: /dev/sda
+          IMG_URL: $$IMG_URL
+        image: public.ecr.aws/eks-anywhere/tinkerbell/hub/image2disk:6c0f0d437bde2c836d90b000312c8b25fa1b65e1-eks-a-15
+        name: stream-image
+        timeout: 720
+      - environment:
+          # An example console declaration that will send all kernel output to both consoles, and systemd output to ttyS0.
+          # kernel {
+          #     console = "tty0", "ttyS0,115200n8"
+          # }
+          BOOTCONFIG_CONTENTS: |
+                        kernel {}
+          DEST_DISK: /dev/sda12
+          DEST_PATH: /bootconfig.data
+          DIRMODE: "0700"
+          FS_TYPE: ext4
+          GID: "0"
+          MODE: "0644"
+          UID: "0"
+        image: public.ecr.aws/eks-anywhere/tinkerbell/hub/writefile:6c0f0d437bde2c836d90b000312c8b25fa1b65e1-eks-a-15
+        name: write-bootconfig
+        timeout: 90
+      - environment:
+          CONTENTS: |
+            # Version is required, it will change as we support
+            # additional settings
+            version = 1
+            # "eno1" is the interface name
+            # Users may turn on dhcp4 and dhcp6 via boolean
+            [eno1]
+            dhcp4 = true
+            # Define this interface as the "primary" interface
+            # for the system.  This IP is what kubelet will use
+            # as the node IP.  If none of the interfaces has
+            # "primary" set, we choose the first interface in
+            # the file
+            primary = true
+          DEST_DISK: /dev/sda12
+          DEST_PATH: /net.toml
+          DIRMODE: "0700"
+          FS_TYPE: ext4
+          GID: "0"
+          MODE: "0644"
+          UID: "0"
+        image: public.ecr.aws/eks-anywhere/tinkerbell/hub/writefile:6c0f0d437bde2c836d90b000312c8b25fa1b65e1-eks-a-15
+        name: write-netconfig
+        timeout: 90
+      - environment:
+          HEGEL_URLS: [http://$$ADMIN_IP:50061,http://$$TINKERBELL_IP:50061]
+          DEST_DISK: /dev/sda12
+          DEST_PATH: /user-data.toml
+          DIRMODE: "0700"
+          FS_TYPE: ext4
+          GID: "0"
+          MODE: "0644"
+          UID: "0"
+        image: public.ecr.aws/eks-anywhere/tinkerbell/hub/writefile:6c0f0d437bde2c836d90b000312c8b25fa1b65e1-eks-a-15
+        name: write-user-data
+        timeout: 90
+      - name: "reboot"
+        image: public.ecr.aws/eks-anywhere/tinkerbell/hub/reboot:6c0f0d437bde2c836d90b000312c8b25fa1b65e1-eks-a-15
+        timeout: 90
+        volumes:
+          - /worker:/worker
+      name: $$NAME
+      volumes:
+      - /dev:/dev
+      - /dev/console:/dev/console
+      - /lib/firmware:/lib/firmware:ro
+      worker: '{{.device_1}}'
+    version: "0.1"
+`
+)
+
+// GetDefaultTinkerbellTemplateConfigTemplateBottlerocket returns the default TinkerbellTemplateConfigTemplate for Bottlerocket.
+func GetDefaultTinkerbellTemplateConfigTemplateBottlerocket() string {
+	return string(defaultTinkerbellTemplateConfigTemplateBottlerocket)
+}
diff --git a/cmd/eksctl-anywhere/cmd/tinkerbelltemplateconfig_defaults_template_ubuntu.go b/cmd/eksctl-anywhere/cmd/tinkerbelltemplateconfig_defaults_template_ubuntu.go
new file mode 100644
index 000000000000..92ce343fd9ff
--- /dev/null
+++ b/cmd/eksctl-anywhere/cmd/tinkerbelltemplateconfig_defaults_template_ubuntu.go
@@ -0,0 +1,116 @@
+package cmd
+
+const (
+	defaultTinkerbellTemplateConfigTemplateUbuntu = `apiVersion: anywhere.eks.amazonaws.com/v1alpha1
+kind: TinkerbellTemplateConfig
+metadata:
+  name: $$NAME
+spec:
+  template:
+    global_timeout: 6000
+    id: ""
+    name: $$NAME
+    tasks:
+    - actions:
+      - environment:
+          COMPRESSED: "true"
+          DEST_DISK: /dev/sda
+          IMG_URL: $$IMG_URL
+        image: public.ecr.aws/eks-anywhere/tinkerbell/hub/image2disk:6c0f0d437bde2c836d90b000312c8b25fa1b65e1-eks-a-15
+        name: stream-image
+        timeout: 720
+      - environment:
+          DEST_DISK: /dev/sda2
+          DEST_PATH: /etc/netplan/config.yaml
+          STATIC_NETPLAN: true
+          DIRMODE: "0755"
+          FS_TYPE: ext4
+          GID: "0"
+          MODE: "0644"
+          UID: "0"
+        image: public.ecr.aws/eks-anywhere/tinkerbell/hub/writefile:6c0f0d437bde2c836d90b000312c8b25fa1b65e1-eks-a-15
+        name: write-netplan
+        timeout: 90
+      - environment:
+          CONTENTS: |
+            datasource:
+              Ec2:
+                metadata_urls: [http://$$ADMIN_IP:50061,http://$$TINKERBELL_IP:50061]
+                strict_id: false
+            manage_etc_hosts: localhost
+            warnings:
+              dsid_missing_source: off
+          DEST_DISK: /dev/sda2
+          DEST_PATH: /etc/cloud/cloud.cfg.d/10_tinkerbell.cfg
+          DIRMODE: "0700"
+          FS_TYPE: ext4
+          GID: "0"
+          MODE: "0600"
+          UID: "0"
+        image: public.ecr.aws/eks-anywhere/tinkerbell/hub/writefile:6c0f0d437bde2c836d90b000312c8b25fa1b65e1-eks-a-15
+        name: add-tink-cloud-init-config
+        timeout: 90
+      - environment:
+          CONTENTS: |
+            network:
+              config: disabled
+          DEST_DISK: /dev/sda2
+          DEST_PATH: /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg
+          DIRMODE: "0700"
+          FS_TYPE: ext4
+          GID: "0"
+          MODE: "0600"
+          UID: "0"
+        image: public.ecr.aws/eks-anywhere/tinkerbell/hub/writefile:6c0f0d437bde2c836d90b000312c8b25fa1b65e1-eks-a-15
+        name: disable-cloud-init-network-capabilities
+        timeout: 90
+      - environment:
+          CONTENTS: |
+            datasource: Ec2
+          DEST_DISK: /dev/sda2
+          DEST_PATH: /etc/cloud/ds-identify.cfg
+          DIRMODE: "0700"
+          FS_TYPE: ext4
+          GID: "0"
+          MODE: "0600"
+          UID: "0"
+        image: public.ecr.aws/eks-anywhere/tinkerbell/hub/writefile:6c0f0d437bde2c836d90b000312c8b25fa1b65e1-eks-a-15
+        name: add-tink-cloud-init-ds-config
+        timeout: 90
+      - environment:
+          BLOCK_DEVICE: /dev/sda2
+          CHROOT: "y"
+          CMD_LINE: apt -y update && apt -y install openssl
+          DEFAULT_INTERPRETER: /bin/sh -c
+          FS_TYPE: ext4
+        image: public.ecr.aws/eks-anywhere/tinkerbell/hub/cexec:6c0f0d437bde2c836d90b000312c8b25fa1b65e1-eks-a-15
+        name: install-openssl
+        timeout: 90
+      - environment:
+          BLOCK_DEVICE: /dev/sda2
+          FS_TYPE: ext4
+          CHROOT: "y"
+          DEFAULT_INTERPRETER: "/bin/sh -c"
+          CMD_LINE: "useradd --password $(openssl passwd -1 tinkerbell) --shell /bin/bash --create-home --groups sudo tinkerbell"
+        image: public.ecr.aws/eks-anywhere/tinkerbell/hub/cexec:6c0f0d437bde2c836d90b000312c8b25fa1b65e1-eks-a-15
+        name: "create-user"
+        timeout: 90
+      - name: "reboot"
+        image: public.ecr.aws/eks-anywhere/tinkerbell/hub/reboot:6c0f0d437bde2c836d90b000312c8b25fa1b65e1-eks-a-15
+        timeout: 90
+        volumes:
+          - /worker:/worker
+      name: $$NAME
+      volumes:
+      - /dev:/dev
+      - /dev/console:/dev/console
+      - /lib/firmware:/lib/firmware:ro
+      worker: '{{.device_1}}'
+    version: "0.1"
+`
+)
+
+// GetDefaultTinkerbellTemplateConfigTemplateUbuntu returns the default TinkerbellTemplateConfigTemplate for Ubuntu.
+func GetDefaultTinkerbellTemplateConfigTemplateUbuntu() string {
+	return string(defaultTinkerbellTemplateConfigTemplateUbuntu)
+}
diff --git a/cmd/eksctl-anywhere/cmd/vsphereparams_defaults_template.go b/cmd/eksctl-anywhere/cmd/vsphereparams_defaults_template.go
new file mode 100644
index 000000000000..47d9ce00b051
--- /dev/null
+++ b/cmd/eksctl-anywhere/cmd/vsphereparams_defaults_template.go
@@ -0,0 +1,40 @@
+package cmd
+
+const (
+	defaultVSphereParamsTemplate = `managementClusterName: <management cluster name>
+podsCidrBlocks:
+  - 192.168.192.0/18
+servicesCidrBlocks:
+  - 10.96.192.0/18
+cpCount: 2
+etcdCount: 3
+workerCount: 3
+cpEndpointHost: <control plane endpoint host ip>
+kubernetesVersion: 1.28
+datacenter: <vDatacenter>
+insecure: true
+network: <vCenterNetwork>
+server: <serverIP>
+thumbprint: <thumprint>
+datastore: <vDatastore>
+folder: <folder>
+cpDiskGiB: 0
+cpMemoryMiB: 0
+cpNumCPUs: 0
+etcdDiskGiB: 0
+etcdMemoryMiB: 0
+etcdNumCPUs: 0
+workerDiskGiB: 256
+workerMemoryMiB: 65536
+workerNumCPUs: 16
+osFamily: "ubuntu"
+resourcePool: <resource pool>
+template: <template name of OS>
+sshAuthorizedKeyFile: <sshKey.pub>
+`
+)
+
+// GetDefaultVSphereParamsTemplate returns the default VSphereParamsTemplate.
+func GetDefaultVSphereParamsTemplate() string {
+	return string(defaultVSphereParamsTemplate)
+}
diff --git a/pkg/api/v1alpha1/cluster.go b/pkg/api/v1alpha1/cluster.go
index 0d5d0d1ca6e4..55c2542d5bd0 100644
--- a/pkg/api/v1alpha1/cluster.go
+++ b/pkg/api/v1alpha1/cluster.go
@@ -40,8 +40,8 @@ var re = regexp.MustCompile(constants.DefaultCuratedPackagesRegistryRegex)
 // +kubebuilder:object:generate=false
 type ClusterGenerateOpt func(config *ClusterGenerate)
 
-// Used for generating yaml for generate clusterconfig command.
-func NewClusterGenerate(clusterName string, opts ...ClusterGenerateOpt) *ClusterGenerate {
+// NewClusterGenerate is used to generate yaml for generate clusterconfig command.
+func NewClusterGenerate(clusterName, managementClusterName, kubernetesVersion string, podsCidrBlocks, servicesCidrBlocks []string, opts ...ClusterGenerateOpt) *ClusterGenerate {
 	clusterConfig := &ClusterGenerate{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       ClusterKind,
@@ -51,19 +51,24 @@ func NewClusterGenerate(clusterName string, opts ...ClusterGenerateOpt) *Cluster
 			Name: clusterName,
 		},
 		Spec: ClusterSpec{
-			KubernetesVersion: GetClusterDefaultKubernetesVersion(),
+			KubernetesVersion: GetClusterKubernetesVersion(kubernetesVersion),
 			ClusterNetwork: ClusterNetwork{
 				Pods: Pods{
-					CidrBlocks: []string{"192.168.0.0/16"},
+					CidrBlocks: GetOrDefaultStringArray(podsCidrBlocks, []string{"192.168.0.0/16"}),
 				},
 				Services: Services{
-					CidrBlocks: []string{"10.96.0.0/12"},
+					CidrBlocks: GetOrDefaultStringArray(servicesCidrBlocks, []string{"10.96.0.0/12"}),
 				},
 				CNIConfig: &CNIConfig{Cilium: &CiliumConfig{}},
 			},
 		},
 	}
-	clusterConfig.SetSelfManaged()
+
+	if clusterName == managementClusterName {
+		clusterConfig.SetSelfManaged()
+	} else {
+		clusterConfig.SetManagedBy(managementClusterName)
+	}
 
 	for _, opt := range opts {
 		opt(clusterConfig)
@@ -103,6 +108,13 @@ func WithClusterEndpoint() ClusterGenerateOpt {
 	}
 }
 
+// WithClusterEndpointHost is a variant of function WithClusterEndpoint with host parameter.
+func WithClusterEndpointHost(host string) ClusterGenerateOpt {
+	return func(c *ClusterGenerate) {
+		c.Spec.ControlPlaneConfiguration.Endpoint = &Endpoint{Host: host}
+	}
+}
+
 // WithCPUpgradeRolloutStrategy allows add UpgradeRolloutStrategy option to cluster config under ControlPlaneConfiguration.
 func WithCPUpgradeRolloutStrategy(maxSurge int, maxUnavailable int) ClusterGenerateOpt {
 	return func(c *ClusterGenerate) {
@@ -228,6 +240,40 @@ func GetClusterDefaultKubernetesVersion() KubernetesVersion {
 	return Kube129
 }
 
+// GetClusterKubernetesVersion returns the kubernetes version for a Cluster.
+func GetClusterKubernetesVersion(kubernetesVersion string) KubernetesVersion {
+	switch kubernetesVersion {
+	case "1.18":
+		return Kube118
+	case "1.19":
+		return Kube119
+	case "1.20":
+		return Kube120
+	case "1.21":
+		return Kube121
+	case "1.22":
+		return Kube122
+	case "1.23":
+		return Kube123
+	case "1.24":
+		return Kube124
+	case "1.25":
+		return Kube125
+	case "1.26":
+		return Kube126
+	case "1.27":
+		return Kube127
+	case "1.28":
+		return Kube128
+	case "1.29":
+		return Kube129
+	case "1.30":
+		return Kube130
+	default:
+		return GetClusterDefaultKubernetesVersion()
+	}
+}
+
 // ValidateClusterConfigContent validates a Cluster object without modifying it
 // Some of the validations are a bit heavy and need a network connection.
 func ValidateClusterConfigContent(clusterConfig *Cluster) error {
diff --git a/pkg/api/v1alpha1/cluster_test.go b/pkg/api/v1alpha1/cluster_test.go
index 39146ef1e1ee..1a33f01c46ff 100644
--- a/pkg/api/v1alpha1/cluster_test.go
+++ b/pkg/api/v1alpha1/cluster_test.go
@@ -3875,7 +3875,7 @@ func TestClusterWorkerNodeConfigCount(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			cg := NewClusterGenerate("test-cluster", WorkerNodeConfigCount(5))
+			cg := NewClusterGenerate("test-cluster", "test-cluster", "", []string{}, []string{}, WorkerNodeConfigCount(5))
 			g := NewWithT(t)
 			g.Expect(cg.Spec.WorkerNodeGroupConfigurations).To(Equal(tt.want))
 		})
@@ -3905,7 +3905,7 @@ func TestClusterCPUpgradeRolloutStrategyNil(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			cg := NewClusterGenerate("test-cluster", ControlPlaneConfigCount(1))
+			cg := NewClusterGenerate("test-cluster", "test-cluster", "", []string{}, []string{}, ControlPlaneConfigCount(1))
 			g := NewWithT(t)
 			g.Expect(cg.Spec.ControlPlaneConfiguration).To(Equal(tt.want))
 		})
@@ -3935,7 +3935,7 @@ func TestClusterCPUpgradeRolloutStrategyNotNil(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			cg := NewClusterGenerate("test-cluster", ControlPlaneConfigCount(1), WithCPUpgradeRolloutStrategy(5, 2))
+			cg := NewClusterGenerate("test-cluster", "test-cluster", "", []string{}, []string{}, ControlPlaneConfigCount(1), WithCPUpgradeRolloutStrategy(5, 2))
 			g := NewWithT(t)
 			g.Expect(cg.Spec.ControlPlaneConfiguration).To(Equal(tt.want))
 		})
@@ -3965,7 +3965,7 @@ func TestClusterMDUpgradeRolloutStrategyNil(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			cg := NewClusterGenerate("test-cluster", WorkerNodeConfigCount(1))
+			cg := NewClusterGenerate("test-cluster", "test-cluster", "", []string{}, []string{}, WorkerNodeConfigCount(1))
 			g := NewWithT(t)
 			g.Expect(cg.Spec.WorkerNodeGroupConfigurations).To(Equal(tt.want))
 		})
@@ -3996,7 +3996,7 @@ func TestClusterMDUpgradeRolloutStrategyNotNil(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			cg := NewClusterGenerate("test-cluster", WorkerNodeConfigCount(1), WithWorkerMachineUpgradeRolloutStrategy(5, 2))
+			cg := NewClusterGenerate("test-cluster", "test-cluster", "", []string{}, []string{}, WorkerNodeConfigCount(1), WithWorkerMachineUpgradeRolloutStrategy(5, 2))
 			g := NewWithT(t)
 			g.Expect(cg.Spec.WorkerNodeGroupConfigurations).To(Equal(tt.want))
 		})
@@ -4006,7 +4006,7 @@ func TestClusterMDUpgradeRolloutStrategyNotNil(t *testing.T) {
 func TestClusterCPUpgradeInPlace(t *testing.T) {
 	g := NewWithT(t)
 
-	cluster := NewClusterGenerate("test-cluster", WorkerNodeConfigCount(1))
+	cluster := NewClusterGenerate("test-cluster", "test-cluster", "", []string{}, []string{}, WorkerNodeConfigCount(1))
 	cluster.Spec.ControlPlaneConfiguration.UpgradeRolloutStrategy = &ControlPlaneUpgradeRolloutStrategy{Type: InPlaceStrategyType}
 	cluster.Spec.WorkerNodeGroupConfigurations[0].UpgradeRolloutStrategy = &WorkerNodesUpgradeRolloutStrategy{Type: InPlaceStrategyType}
 
diff --git a/pkg/api/v1alpha1/cluster_types.go b/pkg/api/v1alpha1/cluster_types.go
index 0c15bec760f4..4537b0090a72 100644
--- a/pkg/api/v1alpha1/cluster_types.go
+++ b/pkg/api/v1alpha1/cluster_types.go
@@ -1402,6 +1402,11 @@ func (c *Cluster) SetManagedBy(managementClusterName string) {
 	c.Spec.ManagementCluster.Name = managementClusterName
 }
 
+// SetManagedBy set the management cluster name of a cluster.
+func (c *ClusterGenerate) SetManagedBy(managementClusterName string) {
+	c.Spec.ManagementCluster.Name = managementClusterName
+}
+
 func (c *Cluster) SetSelfManaged() {
 	c.Spec.ManagementCluster.Name = c.Name
 }
diff --git a/pkg/api/v1alpha1/conditional_functions.go b/pkg/api/v1alpha1/conditional_functions.go
new file mode 100644
index 000000000000..afbc9569c001
--- /dev/null
+++ b/pkg/api/v1alpha1/conditional_functions.go
@@ -0,0 +1,37 @@
+package v1alpha1
+
+// GetOrDefaultInt returns an non-zero int value or the default.
+func GetOrDefaultInt(value, defaultValue int) int {
+	if value != 0 {
+		return value
+	}
+
+	return defaultValue
+}
+
+// GetOrDefaultOSFamily returns an non-empty OSFamily value or the default.
+func GetOrDefaultOSFamily(value, defaultValue OSFamily) OSFamily {
+	if value != "" {
+		return value
+	}
+
+	return defaultValue
+}
+
+// GetOrDefaultString returns an non-empty string value or the default.
+func GetOrDefaultString(value, defaultValue string) string {
+	if value != "" {
+		return value
+	}
+
+	return defaultValue
+}
+
+// GetOrDefaultStringArray returns an non-empty string value array or the default.
+func GetOrDefaultStringArray(value, defaultValue []string) []string {
+	if len(value) != 0 {
+		return value
+	}
+
+	return defaultValue
+}
diff --git a/pkg/api/v1alpha1/tinkerbellclusterconfigparams_types.go b/pkg/api/v1alpha1/tinkerbellclusterconfigparams_types.go
new file mode 100644
index 000000000000..605f2fd27e5b
--- /dev/null
+++ b/pkg/api/v1alpha1/tinkerbellclusterconfigparams_types.go
@@ -0,0 +1,21 @@
+package v1alpha1
+
+// NOTE: yaml tags are required.  Any new fields you add must have yaml tags for the fields to be serialized.
+
+// TinkerbellClusterConfigParams defines the parameters to generate tinkerbell cluster config.
+type TinkerbellClusterConfigParams struct {
+	PodsCidrBlocks                       []string `yaml:"podsCidrBlocks"`
+	ServicesCidrBlocks                   []string `yaml:"servicesCidrBlocks"`
+	ManagementClusterName                string   `yaml:"managementClusterName"`
+	KubernetesVersion                    string   `yaml:"kubernetesVersion"`
+	OSFamily                             OSFamily `yaml:"osFamily"`
+	OSImageURL                           string   `yaml:"osImageURL"`
+	CPEndpointHost                       string   `yaml:"cpEndpointHost"`
+	TinkerbellIP                         string   `yaml:"tinkerbellIP"`
+	AdminIP                              string   `yaml:"adminIP"`
+	CPCount                              int      `yaml:"cpCount"`
+	WorkerCount                          int      `yaml:"workerCount"`
+	HardwareCSV                          string   `yaml:"hardwareCSV"`
+	SSHAuthorizedKeyFile                 string   `yaml:"sshAuthorizedKeyFile"`
+	TinkerbellTemplateConfigTemplateFile string   `yaml:"tinkerbellTemplateConfigTemplateFile"`
+}
diff --git a/pkg/api/v1alpha1/tinkerbelldatacenterconfig.go b/pkg/api/v1alpha1/tinkerbelldatacenterconfig.go
index 1a2cc8fcf062..425afdeb8a21 100644
--- a/pkg/api/v1alpha1/tinkerbelldatacenterconfig.go
+++ b/pkg/api/v1alpha1/tinkerbelldatacenterconfig.go
@@ -13,7 +13,7 @@ import (
 const TinkerbellDatacenterKind = "TinkerbellDatacenterConfig"
 
 // Used for generating yaml for generate clusterconfig command.
-func NewTinkerbellDatacenterConfigGenerate(clusterName string) *TinkerbellDatacenterConfigGenerate {
+func NewTinkerbellDatacenterConfigGenerate(clusterName, tinkerbellIP, osImageURL string) *TinkerbellDatacenterConfigGenerate {
 	return &TinkerbellDatacenterConfigGenerate{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       TinkerbellDatacenterKind,
@@ -22,7 +22,10 @@ func NewTinkerbellDatacenterConfigGenerate(clusterName string) *TinkerbellDatace
 		ObjectMeta: ObjectMeta{
 			Name: clusterName,
 		},
-		Spec: TinkerbellDatacenterConfigSpec{},
+		Spec: TinkerbellDatacenterConfigSpec{
+			TinkerbellIP: tinkerbellIP,
+			OSImageURL:   osImageURL,
+		},
 	}
 }
 
diff --git a/pkg/api/v1alpha1/tinkerbellmachineconfig.go b/pkg/api/v1alpha1/tinkerbellmachineconfig.go
index 6caf77e7ea0b..46112ad89a7e 100644
--- a/pkg/api/v1alpha1/tinkerbellmachineconfig.go
+++ b/pkg/api/v1alpha1/tinkerbellmachineconfig.go
@@ -15,7 +15,7 @@ const TinkerbellMachineConfigKind = "TinkerbellMachineConfig"
 type TinkerbellMachineConfigGenerateOpt func(config *TinkerbellMachineConfigGenerate)
 
 // Used for generating yaml for generate clusterconfig command.
-func NewTinkerbellMachineConfigGenerate(name string, opts ...TinkerbellMachineConfigGenerateOpt) *TinkerbellMachineConfigGenerate {
+func NewTinkerbellMachineConfigGenerate(clusterName, name, mtype, sshAuthorizedKey string, osFamily OSFamily, opts ...TinkerbellMachineConfigGenerateOpt) *TinkerbellMachineConfigGenerate {
 	machineConfig := &TinkerbellMachineConfigGenerate{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       TinkerbellMachineConfigKind,
@@ -25,12 +25,13 @@ func NewTinkerbellMachineConfigGenerate(name string, opts ...TinkerbellMachineCo
 			Name: name,
 		},
 		Spec: TinkerbellMachineConfigSpec{
-			HardwareSelector: HardwareSelector{},
-			OSFamily:         Ubuntu,
+			HardwareSelector: HardwareSelector{"type": mtype},
+			OSFamily:         GetOrDefaultOSFamily(osFamily, Bottlerocket),
+			TemplateRef:      Ref{Kind: "TinkerbellTemplateConfig", Name: clusterName},
 			Users: []UserConfiguration{
 				{
 					Name:              "ec2-user",
-					SshAuthorizedKeys: []string{"ssh-rsa AAAA..."},
+					SshAuthorizedKeys: []string{GetOrDefaultString(sshAuthorizedKey, "ssh-rsa AAAA...")},
 				},
 			},
 		},
diff --git a/pkg/api/v1alpha1/vsphereclusterconfigparams_types.go b/pkg/api/v1alpha1/vsphereclusterconfigparams_types.go
new file mode 100644
index 000000000000..39d2d5f37cc1
--- /dev/null
+++ b/pkg/api/v1alpha1/vsphereclusterconfigparams_types.go
@@ -0,0 +1,35 @@
+package v1alpha1
+
+// NOTE: yaml tags are required.  Any new fields you add must have yaml tags for the fields to be serialized.
+
+// VSphereClusterConfigParams defines the parameters to generate vSphere cluster config.
+type VSphereClusterConfigParams struct {
+	PodsCidrBlocks        []string `yaml:"podsCidrBlocks"`
+	ServicesCidrBlocks    []string `yaml:"servicesCidrBlocks"`
+	CPCount               int      `yaml:"cpCount"`
+	EtcdCount             int      `yaml:"etcdCount"`
+	WorkerCount           int      `yaml:"workerCount"`
+	CPEndpointHost        string   `yaml:"cpEndpointHost"`
+	ManagementClusterName string   `yaml:"managementClusterName"`
+	KubernetesVersion     string   `yaml:"kubernetesVersion"`
+	Datacenter            string   `yaml:"datacenter"`
+	Insecure              bool     `yaml:"insecure"`
+	Network               string   `yaml:"network"`
+	Server                string   `yaml:"server"`
+	Thumbprint            string   `yaml:"thumbprint"`
+	Datastore             string   `yaml:"datastore"`
+	Folder                string   `yaml:"folder"`
+	CPDiskGiB             int      `yaml:"cpDiskGiB"`
+	CPMemoryMiB           int      `yaml:"cpMemoryMiB"`
+	CPNumCPUs             int      `yaml:"cpNumCPUs"`
+	EtcdDiskGiB           int      `yaml:"etcdDiskGiB"`
+	EtcdMemoryMiB         int      `yaml:"etcdMemoryMiB"`
+	EtcdNumCPUs           int      `yaml:"etcdNumCPUs"`
+	WorkerDiskGiB         int      `yaml:"workerDiskGiB"`
+	WorkerMemoryMiB       int      `yaml:"workerMemoryMiB"`
+	WorkerNumCPUs         int      `yaml:"workerNumCPUs"`
+	OSFamily              OSFamily `yaml:"osFamily"`
+	ResourcePool          string   `yaml:"resourcePool"`
+	Template              string   `yaml:"template"`
+	SSHAuthorizedKeyFile  string   `yaml:"sshAuthorizedKeyFile"`
+}
diff --git a/pkg/api/v1alpha1/vspheredatacenterconfig.go b/pkg/api/v1alpha1/vspheredatacenterconfig.go
index eec92170dbc4..9190979d7dee 100644
--- a/pkg/api/v1alpha1/vspheredatacenterconfig.go
+++ b/pkg/api/v1alpha1/vspheredatacenterconfig.go
@@ -19,7 +19,7 @@ const (
 )
 
 // Used for generating yaml for generate clusterconfig command.
-func NewVSphereDatacenterConfigGenerate(clusterName string) *VSphereDatacenterConfigGenerate {
+func NewVSphereDatacenterConfigGenerate(clusterName, datacenter, network, server, thumbprint string, insecure bool) *VSphereDatacenterConfigGenerate {
 	return &VSphereDatacenterConfigGenerate{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       VSphereDatacenterKind,
@@ -28,7 +28,13 @@ func NewVSphereDatacenterConfigGenerate(clusterName string) *VSphereDatacenterCo
 		ObjectMeta: ObjectMeta{
 			Name: clusterName,
 		},
-		Spec: VSphereDatacenterConfigSpec{},
+		Spec: VSphereDatacenterConfigSpec{
+			Datacenter: datacenter,
+			Network:    network,
+			Server:     server,
+			Thumbprint: thumbprint,
+			Insecure:   insecure,
+		},
 	}
 }
 
diff --git a/pkg/api/v1alpha1/vspheremachineconfig.go b/pkg/api/v1alpha1/vspheremachineconfig.go
index 55125f6ba8ec..40dd987a7b58 100644
--- a/pkg/api/v1alpha1/vspheremachineconfig.go
+++ b/pkg/api/v1alpha1/vspheremachineconfig.go
@@ -17,7 +17,7 @@ const (
 )
 
 // Used for generating yaml for generate clusterconfig command.
-func NewVSphereMachineConfigGenerate(name string) *VSphereMachineConfigGenerate {
+func NewVSphereMachineConfigGenerate(name, datastore, folder, resourcePool, template, sshAuthorizedKey string, osFamily OSFamily, diskGiB, numCPUs, memoryMiB int) *VSphereMachineConfigGenerate {
 	return &VSphereMachineConfigGenerate{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       VSphereMachineConfigKind,
@@ -27,13 +27,17 @@ func NewVSphereMachineConfigGenerate(name string) *VSphereMachineConfigGenerate
 			Name: name,
 		},
 		Spec: VSphereMachineConfigSpec{
-			DiskGiB:   DefaultVSphereDiskGiB,
-			NumCPUs:   DefaultVSphereNumCPUs,
-			MemoryMiB: DefaultVSphereMemoryMiB,
-			OSFamily:  DefaultVSphereOSFamily,
+			Datastore:    datastore,
+			Folder:       folder,
+			ResourcePool: resourcePool,
+			Template:     template,
+			DiskGiB:      GetOrDefaultInt(diskGiB, DefaultVSphereDiskGiB),
+			NumCPUs:      GetOrDefaultInt(numCPUs, DefaultVSphereNumCPUs),
+			MemoryMiB:    GetOrDefaultInt(memoryMiB, DefaultVSphereMemoryMiB),
+			OSFamily:     GetOrDefaultOSFamily(osFamily, DefaultVSphereOSFamily),
 			Users: []UserConfiguration{{
 				Name:              "ec2-user",
-				SshAuthorizedKeys: []string{"ssh-rsa AAAA..."},
+				SshAuthorizedKeys: []string{GetOrDefaultString(sshAuthorizedKey, "ssh-rsa AAAA...")},
 			}},
 		},
 	}