alternative mp datadisk design

Author: jcpowermac

pkg/asset/ignition/machine/master.go

@@ -60,9 +60,10 @@ func (a *Master) Generate(_ context.Context, dependencies asset.Parents) error {
 				// platform specific...
 				if installConfig.Config.ControlPlane.Platform.Azure != nil {
 					azurePlatform := installConfig.Config.ControlPlane.Platform.Azure
-					device := fmt.Sprintf("/dev/disk/azure/scsi1/lun%d", azurePlatform.DataDisks[i].Lun)
-
-					AddEtcdDisk(a.Config, device)
+					if d.Etcd.PlatformDiskID == azurePlatform.DataDisks[i].NameSuffix {
+						device := fmt.Sprintf("/dev/disk/azure/scsi1/lun%d", *azurePlatform.DataDisks[i].Lun)
+						AddEtcdDisk(a.Config, device)
+					}
 				}
 			}
 		}

pkg/types/machinepools.go

@@ -60,6 +60,21 @@ const (
 
 type DataDisk struct {
 	Type DataDiskType `json:"type,omitempty"`
+
+	UserDefined *DiskUserDefined `json:"userDefined,omitempty"`
+	Etcd        *DiskEtcd        `json:"etcd,omitempty"`
+	Swap        *DiskSwap        `json:"swap,omitempty"`
+}
+
+type DiskUserDefined struct {
+	PlatformDiskID string `json:"platformDiskID,omitempty"`
+	MountPath      string `json:"mountPath,omitempty"`
+}
+type DiskSwap struct {
+	PlatformDiskID string `json:"platformDiskID,omitempty"`
+}
+type DiskEtcd struct {
+	PlatformDiskID string `json:"platformDiskID,omitempty"`
 }
 
 // MachinePool is a pool of machines to be installed.