Merge pull request #626 from CecileRobertMichon/fix-image-validation

🐛 fix: allow nil image in AzureMachine webhook validation
kubernetes-sigs · May 15, 2020 · edaee99 · edaee99
2 parents db93854 + b9b11aa
commit edaee99
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/api/v1alpha3/azureimage_validation.go b/api/v1alpha3/azureimage_validation.go
@@ -25,7 +25,7 @@ func ValidateImage(image *Image, fldPath *field.Path) field.ErrorList {
 	allErrs := field.ErrorList{}
 
 	if image == nil {
-		allErrs = append(allErrs, field.Required(fldPath, "an image must be specified"))
+		// allow empty image as it is defaulted in the AzureMachine controller
 		return allErrs
 	}
 

diff --git a/api/v1alpha3/azureimage_validation_test.go b/api/v1alpha3/azureimage_validation_test.go
@@ -24,7 +24,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/validation/field"
 )
 
-func TestImageRequired(t *testing.T) {
+func TestImageOptional(t *testing.T) {
 	g := NewWithT(t)
 
 	type test struct {
@@ -34,10 +34,7 @@ func TestImageRequired(t *testing.T) {
 	extension := test{}
 
 	errs := ValidateImage(extension.Image, field.NewPath("image"))
-	g.Expect(errs).To(HaveLen(1))
-	g.Expect(errs[0].Type).To(Equal(field.ErrorTypeRequired))
-	g.Expect(errs[0].Field).To(Equal("image"))
-	g.Expect(errs[0].Detail).NotTo(BeEmpty())
+	g.Expect(errs).To(HaveLen(0))
 }
 
 func TestImageTooManyDetails(t *testing.T) {