Fix UT errors

Signed-off-by: Gong Zhang <[email protected]>

Author: zhanggbj

controllers/vmware/virtualmachinegroup_controller.go

@@ -21,8 +21,6 @@ import (
 
 	vmoprv1 "github.com/vmware-tanzu/vm-operator/api/v1alpha2"
 	apitypes "k8s.io/apimachinery/pkg/types"
-	vmwarev1 "sigs.k8s.io/cluster-api-provider-vsphere/apis/vmware/v1beta1"
-	capvcontext "sigs.k8s.io/cluster-api-provider-vsphere/pkg/context"
 	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 	"sigs.k8s.io/cluster-api/util/predicates"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -34,6 +32,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+
+	vmwarev1 "sigs.k8s.io/cluster-api-provider-vsphere/apis/vmware/v1beta1"
+	capvcontext "sigs.k8s.io/cluster-api-provider-vsphere/pkg/context"
 )
 
 // +kubebuilder:rbac:groups=cluster.x-k8s.io,resources=clusters,verbs=get;list;watch
@@ -77,7 +78,7 @@ func AddVirtualMachineGroupControllerToManager(ctx context.Context, controllerMa
 			handler.EnqueueRequestsFromMapFunc(reconciler.VSphereMachineToVirtualMachineGroup),
 			ctrlbldr.WithPredicates(
 				predicate.Funcs{
-					UpdateFunc:  func(e event.UpdateEvent) bool { return false },
+					UpdateFunc:  func(event.UpdateEvent) bool { return false },
 					CreateFunc:  func(event.CreateEvent) bool { return true },
 					DeleteFunc:  func(event.DeleteEvent) bool { return true },
 					GenericFunc: func(event.GenericEvent) bool { return false },
@@ -89,7 +90,7 @@ func AddVirtualMachineGroupControllerToManager(ctx context.Context, controllerMa
 }
 
 // ClusterToVirtualMachineGroup maps Cluster events to VirtualMachineGroup reconcile requests.
-func (r *VirtualMachineGroupReconciler) ClusterToVirtualMachineGroup(ctx context.Context, a ctrlclient.Object) []reconcile.Request {
+func (r *VirtualMachineGroupReconciler) ClusterToVirtualMachineGroup(_ context.Context, a ctrlclient.Object) []reconcile.Request {
 	cluster, ok := a.(*clusterv1.Cluster)
 	if !ok {
 		return nil

controllers/vmware/virtualmachinegroup_reconciler.go

@@ -30,6 +30,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/klog/v2"
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 	"sigs.k8s.io/cluster-api/util/conditions"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -38,7 +39,6 @@ import (
 
 	vmwarev1 "sigs.k8s.io/cluster-api-provider-vsphere/apis/vmware/v1beta1"
 	infrautilv1 "sigs.k8s.io/cluster-api-provider-vsphere/pkg/util"
-	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 )
 
 const (
@@ -72,6 +72,7 @@ func (r *VirtualMachineGroupReconciler) Reconcile(ctx context.Context, req ctrl.
 	}
 
 	log = log.WithValues("Cluster", klog.KObj(cluster))
+
 	// If Cluster is deleted, just return as VirtualMachineGroup will be GCed and no extra processing needed.
 	if !cluster.DeletionTimestamp.IsZero() {
 		return reconcile.Result{}, nil
@@ -86,10 +87,9 @@ func (r *VirtualMachineGroupReconciler) Reconcile(ctx context.Context, req ctrl.
 
 	// Continue with the main logic.
 	return r.createOrUpdateVMG(ctx, cluster)
-
 }
 
-// createOrUpdateVMG Create or Update VirtualMachineGroup
+// createOrUpdateVMG Create or Update VirtualMachineGroup.
 func (r *VirtualMachineGroupReconciler) createOrUpdateVMG(ctx context.Context, cluster *clusterv1.Cluster) (_ reconcile.Result, reterr error) {
 	log := ctrl.LoggerFrom(ctx)
 
@@ -228,8 +228,7 @@ func (r *VirtualMachineGroupReconciler) createOrUpdateVMG(ctx context.Context, c
 	return reconcile.Result{}, err
 }
 
-// getExpectedVSphereMachines returns the total number of replicas across all
-// MachineDeployments belonging to the Cluster
+// MachineDeployments belonging to the Cluster.
 func getExpectedVSphereMachines(ctx context.Context, kubeClient client.Client, cluster *clusterv1.Cluster) (int32, error) {
 	var mdList clusterv1.MachineDeploymentList
 	if err := kubeClient.List(
@@ -329,8 +328,8 @@ func GenerateVMGPlacementAnnotations(ctx context.Context, vmg *vmoprv1.VirtualMa
 	return annotations, nil
 }
 
-// Duplicated this logic from pkg/services/vmoperator/vmopmachine.go
 // GenerateVirtualMachineName generates the name of a VirtualMachine based on the naming strategy.
+// Duplicated this logic from pkg/services/vmoperator/vmopmachine.go.
 func GenerateVirtualMachineName(machineName string, namingStrategy *vmwarev1.VirtualMachineNamingStrategy) (string, error) {
 	// Per default the name of the VirtualMachine should be equal to the Machine name (this is the same as "{{ .machine.name }}")
 	if namingStrategy == nil || namingStrategy.Template == nil {