Merge pull request #3564 from sbueringer/pr-bump-capi-rc.0

✨ Bump to CAPI v1.11.0-rc.0

Author: k8s-ci-robot

Makefile

@@ -194,7 +194,7 @@ IMPORT_BOSS_VER := v0.28.1
 IMPORT_BOSS := $(abspath $(TOOLS_BIN_DIR)/$(IMPORT_BOSS_BIN))
 IMPORT_BOSS_PKG := k8s.io/code-generator/cmd/import-boss
 
-CAPI_HACK_TOOLS_VER := ead3737e81eff878355a31e8aea6416ecdc0598c # Note: this the commit ID of CAPI v1.11.0-beta.2.
+CAPI_HACK_TOOLS_VER := 1aab5f5381716d5453f06247aaddff05e5ae8c5f # Note: this the commit ID of CAPI v1.11.0-rc.0.
 
 BOSKOSCTL_BIN := boskosctl
 BOSKOSCTL := $(abspath $(TOOLS_BIN_DIR)/$(BOSKOSCTL_BIN))

controllers/clustermodule_reconciler.go

@@ -214,7 +214,7 @@ func toAffinityInput[T client.Object](c client.Client) handler.TypedMapFunc[T, c
 		log = log.WithValues("Cluster", klog.KObj(cluster))
 		ctx = ctrl.LoggerInto(ctx, log)
 
-		if cluster.Spec.InfrastructureRef == nil {
+		if !cluster.Spec.InfrastructureRef.IsDefined() {
 			log.V(4).Error(err, "Failed to get VSphereCluster: Cluster.spec.infrastructureRef not set")
 			return nil
 		}

controllers/vmware/test/controllers_test.go

@@ -225,7 +225,7 @@ func deployInfraMachine(namespace string, machine *clusterv1.Machine, finalizers
 // Updates the InfrastructureRef of a CAPI Cluster to a VSphereCluster. Function
 // does not block on update success.
 func updateClusterInfraRef(cluster *clusterv1.Cluster, infraCluster client.Object, k8sClient client.Client) {
-	cluster.Spec.InfrastructureRef = &clusterv1.ContractVersionedObjectReference{
+	cluster.Spec.InfrastructureRef = clusterv1.ContractVersionedObjectReference{
 		APIGroup: vmwarev1.GroupVersion.Group,
 		Kind:     "VSphereCluster",
 		Name:     infraCluster.GetName(),

controllers/vspherecluster_reconciler.go

@@ -532,7 +532,7 @@ func (r *clusterReconciler) controlPlaneMachineToCluster(ctx context.Context, o
 		return nil
 	}
 	log = log.WithValues("Cluster", klog.KObj(cluster))
-	if cluster.Spec.InfrastructureRef != nil {
+	if cluster.Spec.InfrastructureRef.IsDefined() {
 		log = log.WithValues("VSphereCluster", klog.KRef(cluster.Namespace, cluster.Spec.InfrastructureRef.Name))
 	}
 	ctx = ctrl.LoggerInto(ctx, log)
@@ -547,7 +547,7 @@ func (r *clusterReconciler) controlPlaneMachineToCluster(ctx context.Context, o
 		return nil
 	}
 
-	if cluster.Spec.InfrastructureRef == nil {
+	if !cluster.Spec.InfrastructureRef.IsDefined() {
 		log.Error(nil, "Failed to get VSphereCluster: Cluster.spec.infrastructureRef is not yet set")
 		return nil
 	}

controllers/vspherecluster_reconciler_test.go

@@ -104,7 +104,7 @@ var _ = Describe("VIM based VSphere ClusterReconciler", func() {
 					Namespace:    "default",
 				},
 				Spec: clusterv1.ClusterSpec{
-					InfrastructureRef: &clusterv1.ContractVersionedObjectReference{
+					InfrastructureRef: clusterv1.ContractVersionedObjectReference{
 						APIGroup: infrav1.GroupVersion.Group,
 						Kind:     "VsphereCluster",
 						Name:     instance.Name,
@@ -173,7 +173,7 @@ var _ = Describe("VIM based VSphere ClusterReconciler", func() {
 					Namespace:    "default",
 				},
 				Spec: clusterv1.ClusterSpec{
-					InfrastructureRef: &clusterv1.ContractVersionedObjectReference{
+					InfrastructureRef: clusterv1.ContractVersionedObjectReference{
 						APIGroup: infrav1.GroupVersion.Group,
 						Kind:     "VsphereCluster",
 						Name:     "vsphere-test1",
@@ -257,7 +257,7 @@ var _ = Describe("VIM based VSphere ClusterReconciler", func() {
 				Namespace:    "default",
 			},
 			Spec: clusterv1.ClusterSpec{
-				InfrastructureRef: &clusterv1.ContractVersionedObjectReference{
+				InfrastructureRef: clusterv1.ContractVersionedObjectReference{
 					APIGroup: infrav1.GroupVersion.Group,
 					Kind:     "VsphereCluster",
 					Name:     "vsphere-test1",
@@ -365,7 +365,7 @@ var _ = Describe("VIM based VSphere ClusterReconciler", func() {
 					Namespace:    namespace.Name,
 				},
 				Spec: clusterv1.ClusterSpec{
-					InfrastructureRef: &clusterv1.ContractVersionedObjectReference{
+					InfrastructureRef: clusterv1.ContractVersionedObjectReference{
 						APIGroup: infrav1.GroupVersion.Group,
 						Kind:     "VSphereCluster",
 						Name:     "vsphere-test2",

controllers/vspheredeploymentzone_controller_test.go

@@ -547,7 +547,7 @@ func createMachine(machineName, clusterName, namespace string, isControlPlane bo
 		Spec: clusterv1.MachineSpec{
 			Version: "v1.22.0",
 			Bootstrap: clusterv1.Bootstrap{
-				ConfigRef: &clusterv1.ContractVersionedObjectReference{
+				ConfigRef: clusterv1.ContractVersionedObjectReference{
 					APIGroup: bootstrapv1.GroupVersion.Group,
 					Kind:     "KubeadmConfig",
 					Name:     machineName,

controllers/vspheremachine_controller.go

@@ -230,7 +230,7 @@ func (r *machineReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_
 
 	if cluster != nil {
 		log = log.WithValues("Cluster", klog.KObj(cluster))
-		if cluster.Spec.InfrastructureRef != nil {
+		if cluster.Spec.InfrastructureRef.IsDefined() {
 			log = log.WithValues("VSphereCluster", klog.KRef(cluster.Namespace, cluster.Spec.InfrastructureRef.Name))
 		}
 		ctx = ctrl.LoggerInto(ctx, log)
@@ -315,7 +315,7 @@ func (r *machineReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_
 		return reconcile.Result{}, nil
 	}
 
-	if cluster.Spec.InfrastructureRef == nil {
+	if !cluster.Spec.InfrastructureRef.IsDefined() {
 		log.Info("Cluster.spec.infrastructureRef is not yet set")
 		return reconcile.Result{}, nil
 	}

controllers/vspheremachine_controller_test.go

@@ -68,7 +68,7 @@ var _ = Describe("VsphereMachineReconciler", func() {
 				Namespace:    testNs.Name,
 			},
 			Spec: clusterv1.ClusterSpec{
-				InfrastructureRef: &clusterv1.ContractVersionedObjectReference{
+				InfrastructureRef: clusterv1.ContractVersionedObjectReference{
 					APIGroup: "infrastructure.cluster.x-k8s.io",
 					Kind:     "VSphereCluster",
 					Name:     "vsphere-test1",
@@ -106,7 +106,7 @@ var _ = Describe("VsphereMachineReconciler", func() {
 			Spec: clusterv1.MachineSpec{
 				ClusterName: capiCluster.Name,
 				Bootstrap: clusterv1.Bootstrap{
-					ConfigRef: &clusterv1.ContractVersionedObjectReference{
+					ConfigRef: clusterv1.ContractVersionedObjectReference{
 						APIGroup: "bootstrap.cluster.x-k8s.io",
 						Kind:     "BootstrapConfig",
 						Name:     "does-no-ext", // Does not have to exist for these tests.
@@ -238,7 +238,7 @@ func Test_machineReconciler_Metadata(t *testing.T) {
 			Namespace: ns.Name,
 		},
 		Spec: clusterv1.ClusterSpec{
-			InfrastructureRef: &clusterv1.ContractVersionedObjectReference{
+			InfrastructureRef: clusterv1.ContractVersionedObjectReference{
 				APIGroup: "infrastructure.cluster.x-k8s.io",
 				Kind:     "VSphereCluster",
 				Name:     "vsphere-test1",

controllers/vspherevm_controller.go

@@ -670,7 +670,7 @@ func (r vmReconciler) retrieveVcenterSession(ctx context.Context, vsphereVM *inf
 		return session.GetOrCreate(ctx, params)
 	}
 
-	if cluster.Spec.InfrastructureRef == nil {
+	if !cluster.Spec.InfrastructureRef.IsDefined() {
 		return nil, errors.Errorf("cannot retrieve vCenter session for cluster %s: Cluster.spec.infrastructureRef is nil", klog.KObj(cluster))
 	}
 	key := ctrlclient.ObjectKey{

controllers/vspherevm_controller_test.go

@@ -88,7 +88,7 @@ func TestReconcileNormal_WaitingForIPAddrAllocation(t *testing.T) {
 					Namespace: "test",
 				},
 				Spec: clusterv1.ClusterSpec{
-					InfrastructureRef: &clusterv1.ContractVersionedObjectReference{
+					InfrastructureRef: clusterv1.ContractVersionedObjectReference{
 						Name: vsphereCluster.Name,
 					},
 				},
@@ -476,7 +476,7 @@ func TestRetrievingVCenterCredentialsFromCluster(t *testing.T) {
 				Namespace: "test",
 			},
 			Spec: clusterv1.ClusterSpec{
-				InfrastructureRef: &clusterv1.ContractVersionedObjectReference{
+				InfrastructureRef: clusterv1.ContractVersionedObjectReference{
 					Name: vsphereCluster.Name,
 				},
 			},
@@ -514,9 +514,9 @@ func TestRetrievingVCenterCredentialsFromCluster(t *testing.T) {
 				Namespace: "test",
 			},
 
-			// InfrastructureRef is nil so we should get an error.
+			// InfrastructureRef is not set so we should get an error.
 			Spec: clusterv1.ClusterSpec{
-				InfrastructureRef: nil,
+				// InfrastructureRef not set.
 			},
 		}
 		initObjs := createMachineOwnerHierarchy(machine)