add validation for datastore and storagePolicyName

Signed-off-by: Yassine TIJANI <[email protected]>

Author: yastij

api/v1alpha3/vspheremachine_webhook.go

@@ -52,6 +52,10 @@ func (r *VSphereMachine) ValidateCreate() error {
 			}
 		}
 	}
+
+	if spec.Datastore != "" && spec.StoragePolicyName != "" {
+		allErrs = append(allErrs, field.Invalid(field.NewPath("spec", "Datastore"), spec.Datastore, "cannot be set when spec.StoragePolicyName is also set"))
+	}
 	return aggregateObjErrors(r.GroupVersionKind().GroupKind(), r.Name, allErrs)
 }
 

api/v1alpha3/vspheremachinetemplate_webhook.go

@@ -53,6 +53,10 @@ func (r *VSphereMachineTemplate) ValidateCreate() error {
 			allErrs = append(allErrs, field.Forbidden(field.NewPath("spec", "template", "spec", "network", "devices", "ipAddrs"), "cannot be set in templates"))
 		}
 	}
+
+	if spec.Datastore != "" && spec.StoragePolicyName != "" {
+		allErrs = append(allErrs, field.Invalid(field.NewPath("spec", "Datastore"), spec.Datastore, "cannot be set when spec.StoragePolicyName is also set"))
+	}
 	return aggregateObjErrors(r.GroupVersionKind().GroupKind(), r.Name, allErrs)
 }
 

api/v1alpha3/vspherevm_webhook.go

@@ -52,6 +52,10 @@ func (r *VSphereVM) ValidateCreate() error {
 			}
 		}
 	}
+
+	if spec.Datastore != "" && spec.StoragePolicyName != "" {
+		allErrs = append(allErrs, field.Invalid(field.NewPath("spec", "Datastore"), spec.Datastore, "cannot be set when spec.StoragePolicyName is also set"))
+	}
 	return aggregateObjErrors(r.GroupVersionKind().GroupKind(), r.Name, allErrs)
 }
 

pkg/services/govmomi/vcenter/clone.go

@@ -163,7 +163,6 @@ func Clone(ctx *context.VMContext, bootstrapData []byte) error {
 			MemoryMB:          memMiB,
 		},
 		Location: types.VirtualMachineRelocateSpec{
-			//	Datastore:    types.NewReference(datastore.Reference()),
 			DiskMoveType: string(diskMoveType),
 			Folder:       types.NewReference(folder.Reference()),
 			Pool:         types.NewReference(pool.Reference()),
@@ -202,6 +201,7 @@ func Clone(ctx *context.VMContext, bootstrapData []byte) error {
 	if err != nil {
 		return errors.Wrapf(err, "error trigging clone op for machine %s", ctx)
 	}
+
 	ctx.VSphereVM.Status.TaskRef = task.Reference().Value
 
 	// patch the vsphereVM early to ensure that the task is