Support the legacy iso boot mode:

This is needed for backward compatibility
with Chart <= 0.6.2

Signed-off-by: Jacob Weinstock <[email protected]>

Author: jacobweinstock

api/v1beta1/tinkerbellmachine_types.go

@@ -100,9 +100,9 @@ type BootOptions struct {
 	ISOURL string `json:"isoURL,omitempty"`
 
 	// BootMode is the type of booting that will be done.
-	// Must be one of "none", "netboot", or "isoboot".
+	// Must be one of "none", "netboot", "iso", or "isoboot".
 	// +optional
-	// +kubebuilder:validation:Enum=none;netboot;isoboot
+	// +kubebuilder:validation:Enum=none;netboot;iso;isoboot
 	BootMode BootMode `json:"bootMode,omitempty"`
 }
 

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

@@ -68,10 +68,11 @@ spec:
                   bootMode:
                     description: |-
                       BootMode is the type of booting that will be done.
-                      Must be one of "none", "netboot", or "isoboot".
+                      Must be one of "none", "netboot", "iso", or "isoboot".
                     enum:
                     - none
                     - netboot
+                    - iso
                     - isoboot
                     type: string
                   isoURL:

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

@@ -58,10 +58,11 @@ spec:
                           bootMode:
                             description: |-
                               BootMode is the type of booting that will be done.
-                              Must be one of "none", "netboot", or "isoboot".
+                              Must be one of "none", "netboot", "iso", or "isoboot".
                             enum:
                             - none
                             - netboot
+                            - iso
                             - isoboot
                             type: string
                           isoURL:

controller/machine/workflow.go

@@ -75,7 +75,7 @@ func (scope *machineReconcileScope) createWorkflow(hw *tinkv1.Hardware) error {
 		switch scope.tinkerbellMachine.Spec.BootOptions.BootMode {
 		case v1beta1.BootMode("netboot"):
 			workflow.Spec.BootOptions.BootMode = tinkv1.BootMode("netboot")
-		case v1beta1.BootMode("isoboot"):
+		case v1beta1.BootMode("iso"), v1beta1.BootMode("isoboot"):
 			if scope.tinkerbellMachine.Spec.BootOptions.ISOURL == "" {
 				return errISOBootURLRequired
 			}
@@ -89,7 +89,7 @@ func (scope *machineReconcileScope) createWorkflow(hw *tinkv1.Hardware) error {
 			u.Path = path.Join(urlPath, strings.Replace(hw.Spec.Metadata.Instance.ID, ":", "-", 5), file)
 
 			workflow.Spec.BootOptions.ISOURL = u.String()
-			workflow.Spec.BootOptions.BootMode = tinkv1.BootMode("isoboot")
+			workflow.Spec.BootOptions.BootMode = tinkv1.BootMode(scope.tinkerbellMachine.Spec.BootOptions.BootMode)
 		}
 	}