half the root disk and make an etcd disk with it

api/v1alpha1/linodemachine_types.go

@@ -115,11 +115,6 @@ type LinodeMachineStatus struct {
 	// Addresses contains the Linode instance associated addresses.
 	Addresses []clusterv1.MachineAddress `json:"addresses,omitempty"`
 
-	// EtcdVolumeID contains the ID for the Linode volume associated the node
-	// (control plane nodes only)
-	// +optional
-	EtcdVolumeID int `json:"etcdVolumeID,omitempty"`
-
 	// InstanceState is the state of the Linode instance for this machine.
 	// +optional
 	InstanceState *linodego.InstanceStatus `json:"instanceState,omitempty"`

config/crd/bases/infrastructure.cluster.x-k8s.io_linodemachines.yaml

@@ -272,11 +272,6 @@ spec:
                   - type
                   type: object
                 type: array
-              etcdVolumeID:
-                description: |-
-                  EtcdVolumeID contains the ID for the Linode volume associated the node
-                  (control plane nodes only)
-                type: integer
               failureMessage:
                 description: |-
                   FailureMessage will be set in the event that there is a terminal problem

controller/linodemachine_controller.go

@@ -342,14 +342,47 @@ func (r *LinodeMachineReconciler) reconcileCreate(
 			return nil, err
 		}
 
-		volume, err := services.CreateEtcdVolume(ctx, linodeInstance.ID, logger, machineScope)
+		// get the default instance config
+		configs, err := machineScope.LinodeClient.ListInstanceConfigs(ctx, linodeInstance.ID, &linodego.ListOptions{})
+		if err != nil || len(configs) == 0 {
+			logger.Error(err, "Failed to list instance configs")
+
+			return nil, err
+		}
+		instanceConfig := configs[0]
+
+		// halve the root disk for etcd
+		rootDiskID := instanceConfig.Devices.SDA.DiskID
+		rootDisk, err := machineScope.LinodeClient.GetInstanceDisk(ctx, linodeInstance.ID, rootDiskID)
+		etcdSize := rootDisk.Size / 2
+		if err = machineScope.LinodeClient.ResizeInstanceDisk(ctx, linodeInstance.ID, rootDiskID, rootDisk.Size/2); err != nil {
+			logger.Error(err, "Failed to resize root disk")
+
+			return nil, err
+		}
+
+		// create the etcd disk
+		etcdDisk, err := machineScope.LinodeClient.CreateInstanceDisk(
+			ctx,
+			linodeInstance.ID,
+			linodego.InstanceDiskCreateOptions{
+				Label:      "etcd-data",
+				Size:       etcdSize,
+				Filesystem: string(linodego.FilesystemExt4),
+			},
+		)
 		if err != nil {
-			logger.Error(err, "Failed to create etcd volume")
+			logger.Error(err, "Failed to create etcd disk")
 
 			return nil, err
 		}
-		if volume != nil {
-			machineScope.LinodeMachine.Status.EtcdVolumeID = volume.ID
+
+		instanceConfig.Devices.SDC = &linodego.InstanceConfigDevice{DiskID: etcdDisk.ID}
+		err = machineScope.LinodeClient.BootInstance(ctx, linodeInstance.ID, instanceConfig.ID)
+		if err != nil {
+			logger.Error(err, "Failed to boot instance")
+
+			return nil, err
 		}
 
 	default:
@@ -468,12 +501,6 @@ func (r *LinodeMachineReconciler) reconcileDelete(
 		return err
 	}
 
-	if err := services.DeleteEtcdVolume(ctx, logger, machineScope); err != nil {
-		logger.Error(err, "Failed to delete etcd volume")
-
-		return err
-	}
-
 	if err := machineScope.LinodeClient.DeleteInstance(ctx, *machineScope.LinodeMachine.Spec.InstanceID); err != nil {
 		if util.IgnoreLinodeAPIError(err, http.StatusNotFound) != nil {
 			logger.Error(err, "Failed to delete Linode machine instance")

controller/linodemachine_controller_helpers.go

@@ -57,6 +57,9 @@ func (*LinodeMachineReconciler) newCreateConfig(ctx context.Context, machineScop
 
 		return nil, err
 	}
+
+	createConfig.Booted = util.Pointer(false)
+
 	createConfig.PrivateIP = true
 
 	bootstrapData, err := machineScope.GetBootstrapData(ctx)
@@ -87,7 +90,6 @@ func (*LinodeMachineReconciler) newCreateConfig(ctx context.Context, machineScop
 	if createConfig.Image == "" {
 		createConfig.Image = reconciler.DefaultMachineControllerLinodeImage
 	}
-
 	if createConfig.RootPass == "" {
 		createConfig.RootPass = uuid.NewString()
 	}