Address comments

Signed-off-by: Abhinav Pandey <abhinavmpandey08@gmail.com>
tinkerbell · Feb 1, 2022 · 753d39d · 753d39d
1 parent fb91790
commit 753d39d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/api/v1beta1/tinkerbellmachine_types.go b/api/v1beta1/tinkerbellmachine_types.go
@@ -60,7 +60,8 @@ type TinkerbellMachineSpec struct {
 	// +optional
 	ImageLookupOSVersion string `json:"imageLookupOSVersion,omitempty"`
 
-	// TemplateOverride overrides the default CAPT hardware template
+	// TemplateOverride overrides the default Tinkerbell template used by CAPT.
+	// You can learn more about Tinkerbell templates here: https://docs.tinkerbell.org/templates/
 	// +optional
 	TemplateOverride string `json:"templateOverride,omitempty"`
 

diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_tinkerbellmachines.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_tinkerbellmachines.yaml
@@ -98,8 +98,9 @@ spec:
               providerID:
                 type: string
               templateOverride:
-                description: TemplateOverride overrides the default CAPT hardware
-                  template
+                description: 'TemplateOverride overrides the default Tinkerbell template
+                  used by CAPT. You can learn more about Tinkerbell templates here:
+                  https://docs.tinkerbell.org/templates/'
                 type: string
             type: object
           status:

diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_tinkerbellmachinetemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_tinkerbellmachinetemplates.yaml
@@ -89,8 +89,9 @@ spec:
                       providerID:
                         type: string
                       templateOverride:
-                        description: TemplateOverride overrides the default CAPT hardware
-                          template
+                        description: 'TemplateOverride overrides the default Tinkerbell
+                          template used by CAPT. You can learn more about Tinkerbell
+                          templates here: https://docs.tinkerbell.org/templates/'
                         type: string
                     type: object
                 required:

diff --git a/controllers/machine.go b/controllers/machine.go
@@ -169,12 +169,12 @@ func (mrc *machineReconcileContext) imageURL() (string, error) {
 }
 
 func (mrc *machineReconcileContext) createTemplate(hardware *tinkv1.Hardware) error {
+	if len(hardware.Status.Disks) < 1 {
+		return ErrHardwareMissingDiskConfiguration
+	}
+
 	templateData := mrc.tinkerbellMachine.Spec.TemplateOverride
 	if templateData == "" {
-		if len(hardware.Status.Disks) < 1 {
-			return ErrHardwareMissingDiskConfiguration
-		}
-
 		targetDisk := hardware.Status.Disks[0].Device
 		targetDevice := firstPartitionFromDevice(targetDisk)