fixes

Author: chrischdi

pkg/context/vm_context.go

@@ -21,7 +21,7 @@ import (
 	"context"
 	"fmt"
 
-	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 	"sigs.k8s.io/cluster-api/util/deprecated/v1beta1/patch"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-vsphere/apis/v1beta1"
@@ -52,7 +52,7 @@ func (c *VMContext) Patch(ctx context.Context) error {
 		infrav1.VSphereVMIPAddressClaimsFulfilledV1Beta2Condition,
 		infrav1.VSphereVMGuestSoftPowerOffSucceededV1Beta2Condition,
 		infrav1.VSphereVMPCIDevicesDetachedV1Beta2Condition,
-		clusterv1beta1.PausedV1Beta2Condition,
+		clusterv1.PausedCondition,
 	}})
 }
 

test/e2e/anti_affinity_test.go

@@ -27,7 +27,6 @@ import (
 	"github.com/vmware/govmomi/find"
 	"github.com/vmware/govmomi/vim25/mo"
 	corev1 "k8s.io/api/core/v1"
-	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 	"sigs.k8s.io/cluster-api/test/framework"
 	"sigs.k8s.io/cluster-api/test/framework/clusterctl"
@@ -225,7 +224,7 @@ func FetchWorkerVMsForCluster(ctx context.Context, bootstrapClusterProxy framewo
 
 	workerVMs := []infrav1.VSphereVM{}
 	for _, vm := range vms.Items {
-		if _, ok := vm.Labels[clusterv1beta1.MachineControlPlaneLabel]; !ok {
+		if _, ok := vm.Labels[clusterv1.MachineControlPlaneLabel]; !ok {
 			workerVMs = append(workerVMs, vm)
 		}
 	}

test/e2e/data/shared/capi/v1.10/metadata.yaml

@@ -6,9 +6,6 @@
 apiVersion: clusterctl.cluster.x-k8s.io/v1alpha3
 kind: Metadata
 releaseSeries:
-  - major: 1
-    minor: 11
-    contract: v1beta1
   - major: 1
     minor: 10
     contract: v1beta1

test/e2e/gpu_pci_passthrough_test.go

@@ -26,7 +26,7 @@ import (
 	vim25types "github.com/vmware/govmomi/vim25/types"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/utils/ptr"
-	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 	"sigs.k8s.io/cluster-api/test/framework/clusterctl"
 	capiutil "sigs.k8s.io/cluster-api/util"
 )
@@ -77,7 +77,7 @@ var _ = Describe("Cluster creation with GPU devices as PCI passthrough [speciali
 func verifyPCIDeviceOnWorkerNodes(clusterName, namespace string) {
 	list := getVSphereVMsForCluster(clusterName, namespace)
 	for _, vm := range list.Items {
-		if _, ok := vm.GetLabels()[clusterv1beta1.MachineControlPlaneLabel]; ok {
+		if _, ok := vm.GetLabels()[clusterv1.MachineControlPlaneLabel]; ok {
 			continue
 		}
 		finder := find.NewFinder(vsphereClient.Client, false)