Fix UT errors

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

Author: zhanggbj

controllers/vmware/virtualmachinegroup_reconciler_test.go

@@ -1,3 +1,19 @@
+/*
+Copyright 2025 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package vmware
 
 import (
@@ -23,8 +39,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 )
 
-var s = runtime.NewScheme()
-
 const (
 	clusterName      = "test-cluster"
 	clusterNamespace = "test-ns"
@@ -38,6 +52,9 @@ func TestGetExpectedVSphereMachines(t *testing.T) {
 	g := NewWithT(t)
 	ctx := context.Background()
 
+	scheme := runtime.NewScheme()
+	g.Expect(clusterv1.AddToScheme(scheme)).To(Succeed())
+
 	tests := []struct {
 		name     string
 		cluster  *clusterv1.Cluster
@@ -65,7 +82,7 @@ func TestGetExpectedVSphereMachines(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(tt.cluster).Build()
+		fakeClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(tt.cluster).Build()
 		t.Run(tt.name, func(t *testing.T) {
 			g.Expect(getExpectedVSphereMachines(ctx, fakeClient, tt.cluster)).To(Equal(tt.expected))
 		})
@@ -76,6 +93,9 @@ func TestGetCurrentVSphereMachines(t *testing.T) {
 	g := NewWithT(t)
 	ctx := context.Background()
 
+	scheme := runtime.NewScheme()
+	g.Expect(vmwarev1.AddToScheme(scheme)).To(Succeed())
+
 	// VM names are based on CAPI Machine names, not VSphereMachine names, but we use VSphereMachine here.
 	vsm1 := newVSphereMachine("vsm-1", mdName1, false, nil)
 	vsm2 := newVSphereMachine("vsm-2", mdName2, false, nil)
@@ -107,7 +127,7 @@ func TestGetCurrentVSphereMachines(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(tt.objects...).Build()
+			fakeClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(tt.objects...).Build()
 			got, err := getCurrentVSphereMachines(ctx, fakeClient, clusterNamespace, clusterName)
 			g.Expect(err).NotTo(HaveOccurred())
 			g.Expect(len(got)).To(Equal(tt.want))
@@ -240,6 +260,10 @@ func TestVirtualMachineGroupReconciler_ReconcileFlow(t *testing.T) {
 	g := NewWithT(t)
 	ctx := context.Background()
 
+	scheme := runtime.NewScheme()
+	g.Expect(clusterv1.AddToScheme(scheme)).To(Succeed())
+	g.Expect(vmwarev1.AddToScheme(scheme)).To(Succeed())
+
 	// Initial objects for the successful VMG creation path (Expected: 1, Current: 1)
 	cluster := newCluster(clusterName, clusterNamespace, true, 1, 0)
 	vsm1 := newVSphereMachine("vsm-1", mdName1, false, nil)
@@ -313,7 +337,7 @@ func TestVirtualMachineGroupReconciler_ReconcileFlow(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(tt.initialObjects...).Build()
+			fakeClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(tt.initialObjects...).Build()
 			reconciler := &VirtualMachineGroupReconciler{
 				Client:   fakeClient,
 				Recorder: record.NewFakeRecorder(1),

controllers/vspherecluster_reconciler.go

@@ -427,7 +427,6 @@ func (r *clusterReconciler) reconcileDeploymentZones(ctx context.Context, cluste
 	failureDomains := clusterv1beta1.FailureDomains{}
 	for _, zone := range deploymentZoneList.Items {
 		if zone.Spec.Server != clusterCtx.VSphereCluster.Spec.Server {
-
 			continue
 		}
 

test/go.mod

@@ -10,8 +10,8 @@ replace sigs.k8s.io/cluster-api-provider-vsphere => ../
 
 replace github.com/vmware-tanzu/vm-operator/pkg/constants/testlabels => github.com/vmware-tanzu/vm-operator/pkg/constants/testlabels v1.9.1-0.20251003150112-9b458d311c4c
 
-// The version of vm-operator should be kept in sync with the manifests at: config/deployments/integration-testsz
-replace github.com/vmware-tanzu/vm-operator/api => github.com/vmware-tanzu/vm-operator/api v1.8.6
+// The version of vm-operator should be kept in sync with the manifests at: config/deployments/integration-tests
+replace github.com/vmware-tanzu/vm-operator/api => github.com/vmware-tanzu/vm-operator/api v1.9.1-0.20251003150112-9b458d311c4c
 
 require (
 	github.com/vmware-tanzu/net-operator-api v0.0.0-20240326163340-1f32d6bf7f9d

test/go.sum

@@ -360,8 +360,8 @@ github.com/vmware-tanzu/net-operator-api v0.0.0-20240326163340-1f32d6bf7f9d h1:c
 github.com/vmware-tanzu/net-operator-api v0.0.0-20240326163340-1f32d6bf7f9d/go.mod h1:JbFOh22iDsT5BowJe0GgpMI5e2/S7cWaJlv9LdURVQM=
 github.com/vmware-tanzu/nsx-operator/pkg/apis v0.0.0-20241112044858-9da8637c1b0d h1:z9lrzKVtNlujduv9BilzPxuge/LE2F0N1ms3TP4JZvw=
 github.com/vmware-tanzu/nsx-operator/pkg/apis v0.0.0-20241112044858-9da8637c1b0d/go.mod h1:Q4JzNkNMvjo7pXtlB5/R3oME4Nhah7fAObWgghVmtxk=
-github.com/vmware-tanzu/vm-operator/api v1.8.6 h1:NIndORjcnSmIlQsCMIewpIwg/ocRVDh2lYjOroTVLrU=
-github.com/vmware-tanzu/vm-operator/api v1.8.6/go.mod h1:HHA2SNI9B5Yqtyp5t+Gt9WTWBi/fIkM6+MukDDSf11A=
+github.com/vmware-tanzu/vm-operator/api v1.9.1-0.20251003150112-9b458d311c4c h1:XISTT0dw/XwMlyyiOPHPsXCxfI1Ro2Zuozi6eIacXGo=
+github.com/vmware-tanzu/vm-operator/api v1.9.1-0.20251003150112-9b458d311c4c/go.mod h1:nWTPpxfe4gHuuYuFcrs86+NMxfkqPk3a3IlvI8TCWak=
 github.com/vmware-tanzu/vm-operator/external/ncp v0.0.0-20240404200847-de75746a9505 h1:y4wXx1FUFqqSgJ/xUOEM1DLS2Uu0KaeLADWpzpioGTU=
 github.com/vmware-tanzu/vm-operator/external/ncp v0.0.0-20240404200847-de75746a9505/go.mod h1:5rqRJ9zGR+KnKbkGx373WgN8xJpvAj99kHnfoDYRO5I=
 github.com/vmware/govmomi v0.52.0 h1:JyxQ1IQdllrY7PJbv2am9mRsv3p9xWlIQ66bv+XnyLw=