Default hardware MAC in iso mount workflows

For ISO bootmode, the controller required a placeHolder ":macAddress" to
be present in the ISOURL which would then later be replaced to the MAC
address of the actual hardware during the workflow creation time.
Default the logic to append hardware MAC before the ISO file name by
default without any placeholder, as we are doing it anyways right now
and this slightly alleviates the user experience.

Signed-off-by: Rahul Ganesh <[email protected]>

Author: Rahul Ganesh

api/v1beta1/tinkerbellmachine_types.go

@@ -89,12 +89,13 @@ type BootOptions struct {
 	// for getting the associated hardware into a CDROM booting state.
 	// A HardwareRef that contains a spec.BmcRef must be provided.
 	//
-	// The format of the ISOURL must be http://$IP:$Port/iso/:macAddress/hook.iso
+	// The format of the ISOURL must be http://$IP:$Port/iso/hook.iso
 	// The name of the ISO file must have the .iso extension, but the name can be anything.
 	// The $IP and $Port should generally point to the IP and Port of the Smee server
 	// as this is where the ISO patching endpoint lives.
-	// The ":macAddress" is a placeholder for the MAC address of the hardware and
-	// should be provided exactly as is: ":macAddress".
+	// The controller will append the MAC address of the hardware in the ISO URL
+	// right before the iso file name in the URL.
+	// For ex. the above format would be replaced to http://$IP:$Port/iso/<macAddress>/hook.iso
 	// +optional
 	// +kubebuilder:validation:Format=url
 	ISOURL string `json:"isoURL,omitempty"`

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

@@ -81,12 +81,13 @@ spec:
                       for getting the associated hardware into a CDROM booting state.
                       A HardwareRef that contains a spec.BmcRef must be provided.
 
-                      The format of the ISOURL must be http://$IP:$Port/iso/:macAddress/hook.iso
+                      The format of the ISOURL must be http://$IP:$Port/iso/hook.iso
                       The name of the ISO file must have the .iso extension, but the name can be anything.
                       The $IP and $Port should generally point to the IP and Port of the Smee server
                       as this is where the ISO patching endpoint lives.
-                      The ":macAddress" is a placeholder for the MAC address of the hardware and
-                      should be provided exactly as is: ":macAddress".
+                      The controller will append the MAC address of the hardware in the ISO URL
+                      right before the iso file name in the URL.
+                      For ex. the above format would be replaced to http://$IP:$Port/iso/<macAddress>/hook.iso
                     format: url
                     type: string
                 type: object

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

@@ -71,12 +71,13 @@ spec:
                               for getting the associated hardware into a CDROM booting state.
                               A HardwareRef that contains a spec.BmcRef must be provided.
 
-                              The format of the ISOURL must be http://$IP:$Port/iso/:macAddress/hook.iso
+                              The format of the ISOURL must be http://$IP:$Port/iso/hook.iso
                               The name of the ISO file must have the .iso extension, but the name can be anything.
                               The $IP and $Port should generally point to the IP and Port of the Smee server
                               as this is where the ISO patching endpoint lives.
-                              The ":macAddress" is a placeholder for the MAC address of the hardware and
-                              should be provided exactly as is: ":macAddress".
+                              The controller will append the MAC address of the hardware in the ISO URL
+                              right before the iso file name in the URL.
+                              For ex. the above format would be replaced to http://$IP:$Port/iso/<macAddress>/hook.iso
                             format: url
                             type: string
                         type: object

controller/machine/workflow.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"net/url"
+	"path"
 	"strings"
 
 	"github.com/tinkerbell/cluster-api-provider-tinkerbell/api/v1beta1"
@@ -82,7 +83,10 @@ func (scope *machineReconcileScope) createWorkflow(hw *tinkv1.Hardware) error {
 				return fmt.Errorf("boot option isoURL is not parse-able: %w", err)
 			}
 
-			u.Path = strings.Replace(u.Path, ":macAddress", strings.Replace(hw.Spec.Metadata.Instance.ID, ":", "-", 5), 1)
+			urlPath, file := path.Split(u.Path)
+			urlPath = strings.TrimRight(urlPath, "/")
+			u.Path = fmt.Sprintf("%s/%s/%s", urlPath, strings.Replace(hw.Spec.Metadata.Instance.ID, ":", "-", 5), file)
+
 			workflow.Spec.BootOptions.ISOURL = u.String()
 			workflow.Spec.BootOptions.BootMode = tinkv1.BootMode("iso")
 		}