Handle facility and metro being set and make a log

Signed-off-by: Chris Privitere <[email protected]>

Author: cprivitere

api/v1beta1/packetcluster_webhook.go

@@ -93,12 +93,9 @@ func (c *PacketCluster) ValidateUpdate(oldRaw runtime.Object) error {
 		)
 	}
 
-	// Must not have both Metro and Facility
+	// If both Metro and Facility are set, ignore Facility
 	if len(c.Spec.Facility) > 0 && len(c.Spec.Metro) > 0 {
-		allErrs = append(allErrs,
-			field.Invalid(field.NewPath("spec", "Facility"),
-				c.Spec.Facility, "field is mutually exclusive with Metro"),
-		)
+		clusterlog.Info("Metro and Facility are both set, ignoring Facility.")
 	}
 
 	if len(allErrs) == 0 {

api/v1beta1/packetmachine_webhook.go

@@ -48,28 +48,26 @@ func (m *PacketMachine) ValidateCreate() error {
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type.
 func (m *PacketMachine) ValidateUpdate(old runtime.Object) error {
+	machineLog.Info("validate update", "name", m.Name)
+	var allErrs field.ErrorList
+
 	newPacketMachine, err := runtime.DefaultUnstructuredConverter.ToUnstructured(m)
 	if err != nil {
-		return apierrors.NewInvalid(GroupVersion.WithKind("PacketMachine").GroupKind(), m.Name, field.ErrorList{
-			field.InternalError(nil, errors.Wrap(err, "failed to convert new PacketMachine to unstructured object")),
-		})
+		allErrs = append(allErrs,
+			field.InternalError(nil, errors.Wrap(err,
+				"failed to convert new PacketMachine to unstructured object")))
 	}
+
 	oldPacketMachine, err := runtime.DefaultUnstructuredConverter.ToUnstructured(old)
 	if err != nil {
-		return apierrors.NewInvalid(GroupVersion.WithKind("PacketMachine").GroupKind(), m.Name, field.ErrorList{
-			field.InternalError(nil, errors.Wrap(err, "failed to convert old PacketMachine to unstructured object")),
-		})
+		allErrs = append(allErrs,
+			field.InternalError(nil, errors.Wrap(err,
+				"failed to convert old PacketMachine to unstructured object")))
 	}
 
-	// Either Metro or Facility must be set, but not both
+	// If both Metro and Facility are set, ignore Facility
 	if m.Spec.Metro != "" && m.Spec.Facility != "" {
-		return apierrors.NewInvalid(GroupVersion.WithKind("PacketMachine").GroupKind(), m.Name, field.ErrorList{
-			field.Forbidden(field.NewPath("spec", "metro"), "cannot be set when spec.facility is set"),
-		})
-	} else if m.Spec.Metro == "" && m.Spec.Facility == "" {
-		return apierrors.NewInvalid(GroupVersion.WithKind("PacketMachine").GroupKind(), m.Name, field.ErrorList{
-			field.Required(field.NewPath("spec", "metro"), "must be set when spec.facility is not set"),
-		})
+		machineLog.Info("Metro and Facility are both set, ignoring Facility.")
 	}
 
 	newPacketMachineSpec, _ := newPacketMachine["spec"].(map[string]interface{})
@@ -84,12 +82,17 @@ func (m *PacketMachine) ValidateUpdate(old runtime.Object) error {
 	delete(newPacketMachineSpec, "tags")
 
 	if !reflect.DeepEqual(oldPacketMachineSpec, newPacketMachineSpec) {
-		return apierrors.NewInvalid(GroupVersion.WithKind("PacketMachine").GroupKind(), m.Name, field.ErrorList{
-			field.Forbidden(field.NewPath("spec"), "cannot be modified"),
-		})
+		allErrs = append(allErrs,
+			field.Invalid(field.NewPath("spec"),
+				m.Spec, "cannot be modified"),
+		)
 	}
 
-	return nil
+	if len(allErrs) == 0 {
+		return nil
+	}
+
+	return apierrors.NewInvalid(GroupVersion.WithKind("PacketMachine").GroupKind(), m.Name, allErrs)
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type.