Merge pull request #3537 from sbueringer/pr-bump-capi-2025.07

🌱 Bump to Cluster API 07.07.2025

Author: k8s-ci-robot

Makefile

@@ -190,7 +190,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 := 890d16f24287718d96252affa702ff5857114079 # Note: this the commit ID for CAPI v1.11.0-alpha.2
+CAPI_HACK_TOOLS_VER := afb1afee283a959e0a633198517422351f77b0e4 # Note: this the commit ID for CAPI main 07.07.2025.
 
 BOSKOSCTL_BIN := boskosctl
 BOSKOSCTL := $(abspath $(TOOLS_BIN_DIR)/$(BOSKOSCTL_BIN))

controllers/vmware/test/controllers_test.go

@@ -137,7 +137,11 @@ func deployCluster(namespace string, k8sClient client.Client) (client.ObjectKey,
 			Namespace:    namespace,
 			Finalizers:   []string{"test"},
 		},
-		Spec: clusterv1.ClusterSpec{},
+		Spec: clusterv1.ClusterSpec{
+			ClusterNetwork: &clusterv1.ClusterNetwork{
+				ServiceDomain: "service.domain",
+			},
+		},
 	}
 	Expect(k8sClient.Create(ctx, cluster)).To(Succeed())
 
@@ -187,6 +191,7 @@ func deployCAPIMachine(namespace string, cluster *clusterv1.Cluster, k8sClient c
 		},
 		Spec: clusterv1.MachineSpec{
 			ClusterName: cluster.Name,
+			Bootstrap:   clusterv1.Bootstrap{DataSecretName: ptr.To("data")},
 			InfrastructureRef: clusterv1.ContractVersionedObjectReference{
 				Kind:     "VSphereMachine",
 				Name:     name, // We know that the infra machine is going to be called like the machine.
@@ -567,6 +572,7 @@ var _ = Describe("Reconciliation tests", func() {
 				},
 				Spec: clusterv1.MachineSpec{
 					ClusterName: "crud",
+					Bootstrap:   clusterv1.Bootstrap{DataSecretName: ptr.To("data")},
 					InfrastructureRef: clusterv1.ContractVersionedObjectReference{
 						Kind:     "VSphereMachine",
 						Name:     name, // We know that the infra machine is going to be called like the machine.
@@ -638,7 +644,7 @@ var _ = Describe("Reconciliation tests", func() {
 			}
 			Expect(k8sClient.Create(ctx, secret)).To(Succeed())
 
-			machine.Spec.Version = &version
+			machine.Spec.Version = version
 			machine.Spec.Bootstrap.DataSecretName = &secretName
 			Expect(k8sClient.Update(ctx, machine)).To(Succeed())
 

controllers/vspherecluster_reconciler.go

@@ -141,7 +141,7 @@ func (r *clusterReconciler) patch(ctx context.Context, clusterCtx *capvcontext.C
 	if err := v1beta2conditions.SetSummaryCondition(clusterCtx.VSphereCluster, clusterCtx.VSphereCluster, infrav1.VSphereClusterReadyV1Beta2Condition,
 		v1beta2conditions.ForConditionTypes{
 			infrav1.VSphereClusterVCenterAvailableV1Beta2Condition,
-			// FailureDomainsReady and ClusterModuelsReady may not be always set.
+			// FailureDomainsReady and ClusterModulesReady may not be always set.
 			infrav1.VSphereClusterFailureDomainsReadyV1Beta2Condition,
 			infrav1.VSphereClusterClusterModulesReadyV1Beta2Condition,
 		},

controllers/vspheredeploymentzone_controller.go

@@ -325,10 +325,7 @@ func (r vsphereDeploymentZoneReconciler) reconcileDelete(ctx context.Context, de
 	}
 
 	machinesUsingDeploymentZone := collections.FromMachineList(machines).Filter(collections.ActiveMachines, func(machine *clusterv1.Machine) bool {
-		if machine.Spec.FailureDomain != nil {
-			return *machine.Spec.FailureDomain == deploymentZoneCtx.VSphereDeploymentZone.Name
-		}
-		return false
+		return machine.Spec.FailureDomain == deploymentZoneCtx.VSphereDeploymentZone.Name
 	})
 	if len(machinesUsingDeploymentZone) > 0 {
 		machineNamesStr := util.MachinesAsString(machinesUsingDeploymentZone.SortedByCreationTimestamp())

controllers/vspheredeploymentzone_controller_test.go

@@ -250,7 +250,7 @@ var _ = Describe("VSphereDeploymentZoneReconciler", func() {
 			Context("when machines are using Deployment Zone", func() {
 				It("should block deletion", func() {
 					machineUsingDeplZone := createMachine("machine-using-zone", "cluster-using-zone", machineNamespace.Name, false)
-					machineUsingDeplZone.Spec.FailureDomain = ptr.To(vsphereDeploymentZone.Name)
+					machineUsingDeplZone.Spec.FailureDomain = vsphereDeploymentZone.Name
 					Expect(testEnv.Create(ctx, machineUsingDeplZone)).To(Succeed())
 
 					Expect(testEnv.Delete(ctx, vsphereDeploymentZone)).To(Succeed())
@@ -266,7 +266,7 @@ var _ = Describe("VSphereDeploymentZoneReconciler", func() {
 
 				It("should not block deletion if machines are being deleted", func() {
 					machineBeingDeleted := createMachine("machine-deleted", "cluster-deleted", machineNamespace.Name, false)
-					machineBeingDeleted.Spec.FailureDomain = ptr.To(vsphereDeploymentZone.Name)
+					machineBeingDeleted.Spec.FailureDomain = vsphereDeploymentZone.Name
 					machineBeingDeleted.Finalizers = []string{clusterv1.MachineFinalizer}
 					Expect(testEnv.Create(ctx, machineBeingDeleted)).To(Succeed())
 
@@ -545,7 +545,7 @@ func createMachine(machineName, clusterName, namespace string, isControlPlane bo
 			},
 		},
 		Spec: clusterv1.MachineSpec{
-			Version: ptr.To("v1.22.0"),
+			Version: "v1.22.0",
 			Bootstrap: clusterv1.Bootstrap{
 				ConfigRef: &clusterv1.ContractVersionedObjectReference{
 					APIGroup: bootstrapv1.GroupVersion.Group,
@@ -669,7 +669,7 @@ func TestVSphereDeploymentZoneReconciler_ReconcileDelete(t *testing.T) {
 
 	t.Run("when machines are using deployment zone", func(t *testing.T) {
 		machineUsingDeplZone := createMachine("machine-1", "cluster-1", "ns", false)
-		machineUsingDeplZone.Spec.FailureDomain = ptr.To("blah")
+		machineUsingDeplZone.Spec.FailureDomain = "blah"
 
 		t.Run("should block deletion", func(t *testing.T) {
 			controllerManagerContext := fake.NewControllerManagerContext(machineUsingDeplZone, vsphereFailureDomain)

controllers/vspheremachine_controller.go

@@ -32,6 +32,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/validation"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/klog/v2"
+	"k8s.io/utils/ptr"
 	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 	clusterutilv1 "sigs.k8s.io/cluster-api/util"
@@ -400,7 +401,7 @@ func (r *machineReconciler) reconcileNormal(ctx context.Context, machineCtx capv
 	// 2) If the Cluster is supervisor-based continue to reconcile as InfrastructureProvisioned is not set to true until after the kube apiserver is available.
 	if !r.supervisorBased {
 		// vmwarev1.VSphereCluster doesn't set Cluster.Status.Ready until the API endpoint is available.
-		if machineCtx.GetCluster().Status.Initialization == nil || !machineCtx.GetCluster().Status.Initialization.InfrastructureProvisioned {
+		if machineCtx.GetCluster().Status.Initialization == nil || !ptr.Deref(machineCtx.GetCluster().Status.Initialization.InfrastructureProvisioned, false) {
 			log.Info("Cluster infrastructure is not ready yet, skipping reconciliation")
 			v1beta1conditions.MarkFalse(machineCtx.GetVSphereMachine(), infrav1.VMProvisionedCondition, infrav1.WaitingForClusterInfrastructureReason, clusterv1beta1.ConditionSeverityInfo, "")
 			v1beta2conditions.Set(machineCtx.GetVSphereMachine(), metav1.Condition{

controllers/vspheremachine_controller_test.go

@@ -105,6 +105,13 @@ var _ = Describe("VsphereMachineReconciler", func() {
 			},
 			Spec: clusterv1.MachineSpec{
 				ClusterName: capiCluster.Name,
+				Bootstrap: clusterv1.Bootstrap{
+					ConfigRef: &clusterv1.ContractVersionedObjectReference{
+						APIGroup: "bootstrap.cluster.x-k8s.io",
+						Kind:     "BootstrapConfig",
+						Name:     "does-no-ext", // Does not have to exist for these tests.
+					},
+				},
 				InfrastructureRef: clusterv1.ContractVersionedObjectReference{
 					APIGroup: "infrastructure.cluster.x-k8s.io",
 					Kind:     "VSphereMachine",
@@ -168,7 +175,7 @@ var _ = Describe("VsphereMachineReconciler", func() {
 			if capiCluster.Status.Initialization == nil {
 				capiCluster.Status.Initialization = &clusterv1.ClusterInitializationStatus{}
 			}
-			capiCluster.Status.Initialization.InfrastructureProvisioned = true
+			capiCluster.Status.Initialization.InfrastructureProvisioned = ptr.To(true)
 			return ph.Patch(ctx, capiCluster, patch.WithStatusObservedGeneration{})
 		}, timeout).Should(Succeed())
 
@@ -184,7 +191,7 @@ var _ = Describe("VsphereMachineReconciler", func() {
 			if capiCluster.Status.Initialization == nil {
 				capiCluster.Status.Initialization = &clusterv1.ClusterInitializationStatus{}
 			}
-			capiCluster.Status.Initialization.InfrastructureProvisioned = true
+			capiCluster.Status.Initialization.InfrastructureProvisioned = ptr.To(true)
 			Expect(ph.Patch(ctx, capiCluster, patch.WithStatusObservedGeneration{})).To(Succeed())
 		})
 
@@ -280,6 +287,7 @@ func Test_machineReconciler_Metadata(t *testing.T) {
 		},
 		Spec: clusterv1.MachineSpec{
 			ClusterName: capiCluster.Name,
+			Bootstrap:   clusterv1.Bootstrap{DataSecretName: ptr.To("data")},
 			InfrastructureRef: clusterv1.ContractVersionedObjectReference{
 				APIGroup: "infrastructure.cluster.x-k8s.io",
 				Kind:     "VSphereMachine",

controllers/vspherevm_controller.go

@@ -234,10 +234,10 @@ func (r vmReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.R
 	}
 
 	var vsphereFailureDomain *infrav1.VSphereFailureDomain
-	if failureDomain := machine.Spec.FailureDomain; failureDomain != nil {
+	if failureDomain := machine.Spec.FailureDomain; failureDomain != "" {
 		vsphereDeploymentZone := &infrav1.VSphereDeploymentZone{}
-		if err := r.Client.Get(ctx, apitypes.NamespacedName{Name: *failureDomain}, vsphereDeploymentZone); err != nil {
-			return reconcile.Result{}, errors.Wrapf(err, "failed to get VSphereDeploymentZone %s", *failureDomain)
+		if err := r.Client.Get(ctx, apitypes.NamespacedName{Name: failureDomain}, vsphereDeploymentZone); err != nil {
+			return reconcile.Result{}, errors.Wrapf(err, "failed to get VSphereDeploymentZone %s", failureDomain)
 		}
 
 		vsphereFailureDomain = &infrav1.VSphereFailureDomain{}

controllers/vspherevm_controller_test.go

@@ -29,6 +29,7 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	apirecord "k8s.io/client-go/tools/record"
+	"k8s.io/utils/ptr"
 	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 	ipamv1beta1 "sigs.k8s.io/cluster-api/api/ipam/v1beta1"
 	"sigs.k8s.io/cluster-api/controllers/clustercache"
@@ -93,7 +94,7 @@ func TestReconcileNormal_WaitingForIPAddrAllocation(t *testing.T) {
 				},
 				Status: clusterv1.ClusterStatus{
 					Initialization: &clusterv1.ClusterInitializationStatus{
-						InfrastructureProvisioned: true,
+						InfrastructureProvisioned: ptr.To(true),
 					},
 				},
 			}

go.mod

@@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-provider-vsphere
 
 go 1.24.0
 
-replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.11.0-alpha.2
+replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.11.0-alpha.2.0.20250707091926-afb1afee283a
 
 replace github.com/vmware-tanzu/vm-operator/pkg/constants/testlabels => github.com/vmware-tanzu/vm-operator/pkg/constants/testlabels v0.0.0-20240404200847-de75746a9505