Merge pull request #1275 from bryanv/bryanv/vm-custermod-from-setrp-status

🌱 Use VMSetRP Status to determine if VM cluster module exists

Author: bryanv

pkg/providers/vsphere/vmprovider_resourcepolicy.go

@@ -117,29 +117,6 @@ func (vs *vSphereVMProvider) DeleteVirtualMachineSetResourcePolicy(
 	return apierrorsutil.NewAggregate(errs)
 }
 
-// doClusterModulesExist checks whether all the ClusterModules for the given VirtualMachineSetResourcePolicy
-// have been created and exist in VC for the Session's Cluster.
-func (vs *vSphereVMProvider) doClusterModulesExist(
-	ctx context.Context,
-	clusterModProvider clustermodules.Provider,
-	clusterRef vimtypes.ManagedObjectReference,
-	resourcePolicy *vmopv1.VirtualMachineSetResourcePolicy) (bool, error) {
-
-	for _, groupName := range resourcePolicy.Spec.ClusterModuleGroups {
-		_, moduleID := clustermodules.FindClusterModuleUUID(ctx, groupName, clusterRef, resourcePolicy)
-		if moduleID == "" {
-			return false, nil
-		}
-
-		exists, err := clusterModProvider.DoesModuleExist(ctx, moduleID, clusterRef)
-		if !exists || err != nil {
-			return false, err
-		}
-	}
-
-	return true, nil
-}
-
 // createClusterModules creates all the ClusterModules that has not created yet for a
 // given VirtualMachineSetResourcePolicy in VC.
 func (vs *vSphereVMProvider) createClusterModules(

pkg/providers/vsphere/vmprovider_vm.go

@@ -674,7 +674,7 @@ func (vs *vSphereVMProvider) getCreateArgs(
 		}
 	}
 
-	if err := vs.vmCreateIsReady(vmCtx, vcClient, createArgs); err != nil {
+	if err := vs.vmCreateIsReady(vmCtx, createArgs); err != nil {
 		return nil, err
 	}
 
@@ -1936,17 +1936,18 @@ func (vs *vSphereVMProvider) vmCreateGetSourceFilePathsVerify(
 
 func (vs *vSphereVMProvider) vmCreateIsReady(
 	vmCtx pkgctx.VirtualMachineContext,
-	vcClient *vcclient.Client,
 	createArgs *VMCreateArgs) error {
 
 	if policy := createArgs.ResourcePolicy; policy != nil {
-		// TODO: May want to do this as to filter the placement candidates.
-		clusterModuleProvider := clustermodules.NewProvider(vcClient.RestClient())
-		exists, err := vs.doClusterModulesExist(vmCtx, clusterModuleProvider, createArgs.ClusterMoRef, policy)
-		if err != nil {
-			return err
-		} else if !exists {
-			return fmt.Errorf("VirtualMachineSetResourcePolicy cluster module is not ready")
+		if name := vmCtx.VM.Annotations[pkgconst.ClusterModuleNameAnnotationKey]; name != "" {
+			_, moduleUUID := clustermodules.FindClusterModuleUUID(
+				vmCtx,
+				name,
+				createArgs.ClusterMoRef,
+				policy)
+			if moduleUUID == "" {
+				return fmt.Errorf("VirtualMachineSetResourcePolicy cluster module is not ready")
+			}
 		}
 	}
 

pkg/providers/vsphere/vmprovider_vm_test.go

@@ -3926,8 +3926,7 @@ func vmTests() {
 				clusterModName := "bogusClusterMod"
 				vm.Annotations["vsphere-cluster-module-group"] = clusterModName
 				err := createOrUpdateVM(ctx, vmProvider, vm)
-				Expect(err).To(HaveOccurred())
-				Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("ClusterModule %q not found", clusterModName)))
+				Expect(err).To(MatchError("VirtualMachineSetResourcePolicy cluster module is not ready"))
 			})
 		})