Merge pull request #2085 from honza/webhook-template

🐛 Add CustomDeploy to metal3machinetemplate webhook
metal3-io · Nov 13, 2024 · 79aff95 · 79aff95
2 parents 2073b84 + cda3d94
commit 79aff95
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/api/v1beta1/metal3machinetemplate_webhook.go b/api/v1beta1/metal3machinetemplate_webhook.go
@@ -55,7 +55,9 @@ func (c *Metal3MachineTemplate) ValidateDelete() (admission.Warnings, error) {
 func (c *Metal3MachineTemplate) validate() error {
 	var allErrs field.ErrorList
 
-	allErrs = append(allErrs, c.Spec.Template.Spec.Image.Validate(*field.NewPath("Spec", "Template", "Spec", "Image"))...)
+	if c.Spec.Template.Spec.CustomDeploy == nil || c.Spec.Template.Spec.CustomDeploy.Method == "" {
+		allErrs = append(allErrs, c.Spec.Template.Spec.Image.Validate(*field.NewPath("Spec", "Template", "Spec", "Image"))...)
+	}
 
 	if len(allErrs) == 0 {
 		return nil

diff --git a/api/v1beta1/metal3machinetemplate_webhook_test.go b/api/v1beta1/metal3machinetemplate_webhook_test.go
@@ -58,6 +58,21 @@ func TestMetal3MachineTemplateValidation(t *testing.T) {
 	validIso.Spec.Template.Spec.Image.Checksum = ""
 	validIso.Spec.Template.Spec.Image.DiskFormat = ptr.To(LiveISODiskFormat)
 
+	validCustomDeploy := &Metal3MachineTemplate{
+		ObjectMeta: metav1.ObjectMeta{
+			Namespace: "foo",
+		},
+		Spec: Metal3MachineTemplateSpec{
+			Template: Metal3MachineTemplateResource{
+				Spec: Metal3MachineSpec{
+					CustomDeploy: &CustomDeploy{
+						Method: "install_great_stuff",
+					},
+				},
+			},
+		},
+	}
+
 	tests := []struct {
 		name      string
 		expectErr bool
@@ -83,6 +98,11 @@ func TestMetal3MachineTemplateValidation(t *testing.T) {
 			expectErr: false,
 			c:         validIso,
 		},
+		{
+			name:      "should succeed with customDeploy",
+			expectErr: false,
+			c:         validCustomDeploy,
+		},
 	}
 
 	for _, tt := range tests {