Fix typo for WithOwnedV1beta1Conditions to WithOwnedV1Beta1Conditions

chrischdi · chrischdi · commit 59a8b984415a · 2025-05-15T16:24:26.000+02:00
diff --git a/bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller.go b/bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller.go
@@ -255,7 +255,7 @@ func (r *KubeadmConfigReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 		}
 		// Patch ObservedGeneration only if the reconciliation completed successfully
 		patchOpts := []patch.Option{
-			patch.WithOwnedV1beta1Conditions{Conditions: []clusterv1.ConditionType{
+			patch.WithOwnedV1Beta1Conditions{Conditions: []clusterv1.ConditionType{
 				clusterv1.ReadyV1Beta1Condition,
 				bootstrapv1.DataSecretAvailableV1Beta1Condition,
 				bootstrapv1.CertificatesAvailableV1Beta1Condition,
diff --git a/controlplane/kubeadm/internal/control_plane.go b/controlplane/kubeadm/internal/control_plane.go
@@ -330,7 +330,7 @@ func (c *ControlPlane) PatchMachines(ctx context.Context) error {
 	for i := range c.Machines {
 		machine := c.Machines[i]
 		if helper, ok := c.machinesPatchHelpers[machine.Name]; ok {
-			if err := helper.Patch(ctx, machine, patch.WithOwnedV1beta1Conditions{Conditions: []clusterv1.ConditionType{
+			if err := helper.Patch(ctx, machine, patch.WithOwnedV1Beta1Conditions{Conditions: []clusterv1.ConditionType{
 				controlplanev1.MachineAPIServerPodHealthyV1Beta1Condition,
 				controlplanev1.MachineControllerManagerPodHealthyV1Beta1Condition,
 				controlplanev1.MachineSchedulerPodHealthyV1Beta1Condition,
diff --git a/controlplane/kubeadm/internal/controllers/controller.go b/controlplane/kubeadm/internal/controllers/controller.go
@@ -327,7 +327,7 @@ func patchKubeadmControlPlane(ctx context.Context, patchHelper *patch.Helper, kc
 	// Also, if requested, we are adding additional options like e.g. Patch ObservedGeneration when issuing the
 	// patch at the end of the reconcile loop.
 	options = append(options,
-		patch.WithOwnedV1beta1Conditions{Conditions: []clusterv1.ConditionType{
+		patch.WithOwnedV1Beta1Conditions{Conditions: []clusterv1.ConditionType{
 			controlplanev1.MachinesCreatedV1Beta1Condition,
 			clusterv1.ReadyV1Beta1Condition,
 			controlplanev1.MachinesSpecUpToDateV1Beta1Condition,
diff --git a/controlplane/kubeadm/internal/controllers/remediation.go b/controlplane/kubeadm/internal/controllers/remediation.go
@@ -77,7 +77,7 @@ func (r *KubeadmControlPlaneReconciler) reconcileUnhealthyMachines(ctx context.C
 			conditions.Delete(m, clusterv1.MachineOwnerRemediatedCondition)
 		}
 
-		if err := patchHelper.Patch(ctx, m, patch.WithOwnedV1beta1Conditions{Conditions: []clusterv1.ConditionType{
+		if err := patchHelper.Patch(ctx, m, patch.WithOwnedV1Beta1Conditions{Conditions: []clusterv1.ConditionType{
 			clusterv1.MachineOwnerRemediatedV1Beta1Condition,
 		}}, patch.WithOwnedConditions{Conditions: []string{
 			clusterv1.MachineOwnerRemediatedCondition,
@@ -156,7 +156,7 @@ func (r *KubeadmControlPlaneReconciler) reconcileUnhealthyMachines(ctx context.C
 	defer func() {
 		// Always attempt to Patch the Machine conditions after each reconcileUnhealthyMachines.
 		if err := patchHelper.Patch(ctx, machineToBeRemediated,
-			patch.WithOwnedV1beta1Conditions{Conditions: []clusterv1.ConditionType{
+			patch.WithOwnedV1Beta1Conditions{Conditions: []clusterv1.ConditionType{
 				clusterv1.MachineOwnerRemediatedV1Beta1Condition,
 			}},
 			patch.WithOwnedConditions{Conditions: []string{
diff --git a/exp/internal/controllers/machinepool_controller.go b/exp/internal/controllers/machinepool_controller.go
@@ -206,7 +206,7 @@ func (r *MachinePoolReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		// Always attempt to patch the object and status after each reconciliation.
 		// Patch ObservedGeneration only if the reconciliation completed successfully
 		patchOpts := []patch.Option{
-			patch.WithOwnedV1beta1Conditions{Conditions: []clusterv1.ConditionType{
+			patch.WithOwnedV1Beta1Conditions{Conditions: []clusterv1.ConditionType{
 				clusterv1.ReadyV1Beta1Condition,
 				clusterv1.BootstrapReadyV1Beta1Condition,
 				clusterv1.InfrastructureReadyV1Beta1Condition,
diff --git a/exp/runtime/internal/controllers/extensionconfig_controller.go b/exp/runtime/internal/controllers/extensionconfig_controller.go
@@ -179,7 +179,7 @@ func patchExtensionConfig(ctx context.Context, client client.Client, original, m
 	}
 
 	options = append(options,
-		patch.WithOwnedV1beta1Conditions{Conditions: []clusterv1.ConditionType{
+		patch.WithOwnedV1Beta1Conditions{Conditions: []clusterv1.ConditionType{
 			runtimev1.RuntimeExtensionDiscoveredV1Beta1Condition,
 		}},
 		patch.WithOwnedConditions{Conditions: []string{
diff --git a/internal/controllers/cluster/cluster_controller.go b/internal/controllers/cluster/cluster_controller.go
@@ -270,7 +270,7 @@ func patchCluster(ctx context.Context, patchHelper *patch.Helper, cluster *clust
 	// Also, if requested, we are adding additional options like e.g. Patch ObservedGeneration when issuing the
 	// patch at the end of the reconcile loop.
 	options = append(options,
-		patch.WithOwnedV1beta1Conditions{Conditions: []clusterv1.ConditionType{
+		patch.WithOwnedV1Beta1Conditions{Conditions: []clusterv1.ConditionType{
 			clusterv1.ReadyV1Beta1Condition,
 			clusterv1.ControlPlaneReadyV1Beta1Condition,
 			clusterv1.InfrastructureReadyV1Beta1Condition,
diff --git a/internal/controllers/clusterclass/clusterclass_controller.go b/internal/controllers/clusterclass/clusterclass_controller.go
@@ -136,7 +136,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (retres ct
 		updateStatus(ctx, s)
 
 		patchOpts := []patch.Option{
-			patch.WithOwnedV1beta1Conditions{Conditions: []clusterv1.ConditionType{
+			patch.WithOwnedV1Beta1Conditions{Conditions: []clusterv1.ConditionType{
 				clusterv1.ClusterClassRefVersionsUpToDateV1Beta1Condition,
 				clusterv1.ClusterClassVariablesReconciledV1Beta1Condition,
 			}},
diff --git a/internal/controllers/machine/machine_controller.go b/internal/controllers/machine/machine_controller.go
@@ -311,7 +311,7 @@ func patchMachine(ctx context.Context, patchHelper *patch.Helper, machine *clust
 	// Also, if requested, we are adding additional options like e.g. Patch ObservedGeneration when issuing the
 	// patch at the end of the reconcile loop.
 	options = append(options,
-		patch.WithOwnedV1beta1Conditions{Conditions: []clusterv1.ConditionType{
+		patch.WithOwnedV1Beta1Conditions{Conditions: []clusterv1.ConditionType{
 			clusterv1.ReadyV1Beta1Condition,
 			clusterv1.BootstrapReadyV1Beta1Condition,
 			clusterv1.InfrastructureReadyV1Beta1Condition,
diff --git a/internal/controllers/machinedeployment/machinedeployment_controller.go b/internal/controllers/machinedeployment/machinedeployment_controller.go
@@ -210,7 +210,7 @@ func patchMachineDeployment(ctx context.Context, patchHelper *patch.Helper, md *
 
 	// Patch the object, ignoring conflicts on the conditions owned by this controller.
 	options = append(options,
-		patch.WithOwnedV1beta1Conditions{Conditions: []clusterv1.ConditionType{
+		patch.WithOwnedV1Beta1Conditions{Conditions: []clusterv1.ConditionType{
 			clusterv1.ReadyV1Beta1Condition,
 			clusterv1.MachineDeploymentAvailableV1Beta1Condition,
 		}},
diff --git a/internal/controllers/machinehealthcheck/machinehealthcheck_controller.go b/internal/controllers/machinehealthcheck/machinehealthcheck_controller.go
@@ -167,7 +167,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Re
 		// Always attempt to patch the object and status after each reconciliation.
 		// Patch ObservedGeneration only if the reconciliation completed successfully
 		patchOpts := []patch.Option{
-			patch.WithOwnedV1beta1Conditions{Conditions: []clusterv1.ConditionType{
+			patch.WithOwnedV1Beta1Conditions{Conditions: []clusterv1.ConditionType{
 				clusterv1.RemediationAllowedV1Beta1Condition,
 			}},
 			patch.WithOwnedConditions{Conditions: []string{
@@ -303,7 +303,7 @@ func (r *Reconciler) reconcile(ctx context.Context, logger logr.Logger, cluster
 		errList := []error{}
 		for _, t := range append(healthy, unhealthy...) {
 			patchOpts := []patch.Option{
-				patch.WithOwnedV1beta1Conditions{Conditions: []clusterv1.ConditionType{
+				patch.WithOwnedV1Beta1Conditions{Conditions: []clusterv1.ConditionType{
 					clusterv1.MachineHealthCheckSucceededV1Beta1Condition,
 					// Note: intentionally leaving out OwnerRemediated condition which is mostly controlled by the owner.
 				}},
@@ -394,7 +394,7 @@ func (r *Reconciler) patchHealthyTargets(ctx context.Context, logger logr.Logger
 		}
 
 		patchOpts := []patch.Option{
-			patch.WithOwnedV1beta1Conditions{Conditions: []clusterv1.ConditionType{
+			patch.WithOwnedV1Beta1Conditions{Conditions: []clusterv1.ConditionType{
 				clusterv1.MachineHealthCheckSucceededV1Beta1Condition,
 				// Note: intentionally leaving out OwnerRemediated condition which is mostly controlled by the owner.
 			}},
@@ -512,7 +512,7 @@ func (r *Reconciler) patchUnhealthyTargets(ctx context.Context, logger logr.Logg
 		}
 
 		patchOpts := []patch.Option{
-			patch.WithOwnedV1beta1Conditions{Conditions: []clusterv1.ConditionType{
+			patch.WithOwnedV1Beta1Conditions{Conditions: []clusterv1.ConditionType{
 				clusterv1.MachineHealthCheckSucceededV1Beta1Condition,
 				// Note: intentionally leaving out OwnerRemediated condition which is mostly controlled by the owner.
 			}},
diff --git a/internal/controllers/machineset/machineset_controller.go b/internal/controllers/machineset/machineset_controller.go
@@ -316,7 +316,7 @@ func patchMachineSet(ctx context.Context, patchHelper *patch.Helper, machineSet
 
 	// Patch the object, ignoring conflicts on the conditions owned by this controller.
 	options := []patch.Option{
-		patch.WithOwnedV1beta1Conditions{Conditions: []clusterv1.ConditionType{
+		patch.WithOwnedV1Beta1Conditions{Conditions: []clusterv1.ConditionType{
 			clusterv1.ReadyV1Beta1Condition,
 			clusterv1.MachinesCreatedV1Beta1Condition,
 			clusterv1.ResizedV1Beta1Condition,
@@ -1356,7 +1356,7 @@ func (r *Reconciler) reconcileUnhealthyMachines(ctx context.Context, s *scope) (
 			conditions.Delete(m, clusterv1.MachineOwnerRemediatedCondition)
 		}
 
-		if err := patchHelper.Patch(ctx, m, patch.WithOwnedV1beta1Conditions{Conditions: []clusterv1.ConditionType{
+		if err := patchHelper.Patch(ctx, m, patch.WithOwnedV1Beta1Conditions{Conditions: []clusterv1.ConditionType{
 			clusterv1.MachineOwnerRemediatedV1Beta1Condition,
 		}}, patch.WithOwnedConditions{Conditions: []string{
 			clusterv1.MachineOwnerRemediatedCondition,
@@ -1546,7 +1546,7 @@ func patchMachineConditions(ctx context.Context, c client.Client, machines []*cl
 		conditions.Set(m, condition)
 
 		if err := patchHelper.Patch(ctx, m,
-			patch.WithOwnedV1beta1Conditions{Conditions: []clusterv1.ConditionType{
+			patch.WithOwnedV1Beta1Conditions{Conditions: []clusterv1.ConditionType{
 				clusterv1.MachineOwnerRemediatedV1Beta1Condition,
 			}}, patch.WithOwnedConditions{Conditions: []string{
 				clusterv1.MachineOwnerRemediatedCondition,
diff --git a/internal/controllers/topology/cluster/cluster_controller.go b/internal/controllers/topology/cluster/cluster_controller.go
@@ -306,10 +306,10 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Re
 			return
 		}
 		options := []patch.Option{
-			patch.WithOwnedV1beta1Conditions{Conditions: []clusterv1.ConditionType{
+			patch.WithOwnedV1Beta1Conditions{Conditions: []clusterv1.ConditionType{
 				clusterv1.TopologyReconciledV1Beta1Condition,
 			}},
-			patch.WithOwnedV1beta1Conditions{Conditions: []clusterv1.ConditionType{
+			patch.WithOwnedV1Beta1Conditions{Conditions: []clusterv1.ConditionType{
 				clusterv1.ClusterTopologyReconciledCondition,
 			}},
 		}
diff --git a/test/infrastructure/docker/exp/internal/controllers/dockermachinepool_controller.go b/test/infrastructure/docker/exp/internal/controllers/dockermachinepool_controller.go
@@ -448,7 +448,7 @@ func patchDockerMachinePool(ctx context.Context, patchHelper *patch.Helper, dock
 	return patchHelper.Patch(
 		ctx,
 		dockerMachinePool,
-		patch.WithOwnedV1beta1Conditions{Conditions: []clusterv1.ConditionType{
+		patch.WithOwnedV1Beta1Conditions{Conditions: []clusterv1.ConditionType{
 			clusterv1.ReadyV1Beta1Condition,
 			expv1.ReplicasReadyV1Beta1Condition,
 		}},
diff --git a/test/infrastructure/docker/internal/controllers/backends/docker/dockercluster_backend.go b/test/infrastructure/docker/internal/controllers/backends/docker/dockercluster_backend.go
@@ -198,7 +198,7 @@ func (r *ClusterBackEndReconciler) PatchDevCluster(ctx context.Context, patchHel
 	return patchHelper.Patch(
 		ctx,
 		dockerCluster,
-		patch.WithOwnedV1beta1Conditions{Conditions: []clusterv1.ConditionType{
+		patch.WithOwnedV1Beta1Conditions{Conditions: []clusterv1.ConditionType{
 			clusterv1.ReadyV1Beta1Condition,
 			infrav1.LoadBalancerAvailableCondition,
 		}},
diff --git a/test/infrastructure/docker/internal/controllers/backends/docker/dockermachine_backend.go b/test/infrastructure/docker/internal/controllers/backends/docker/dockermachine_backend.go
@@ -486,7 +486,7 @@ func (r *MachineBackendReconciler) PatchDevMachine(ctx context.Context, patchHel
 	return patchHelper.Patch(
 		ctx,
 		dockerMachine,
-		patch.WithOwnedV1beta1Conditions{Conditions: []clusterv1.ConditionType{
+		patch.WithOwnedV1Beta1Conditions{Conditions: []clusterv1.ConditionType{
 			clusterv1.ReadyV1Beta1Condition,
 			infrav1.ContainerProvisionedCondition,
 			infrav1.BootstrapExecSucceededCondition,
diff --git a/test/infrastructure/docker/internal/controllers/backends/inmemory/inmemorymachine_backend.go b/test/infrastructure/docker/internal/controllers/backends/inmemory/inmemorymachine_backend.go
@@ -1269,7 +1269,7 @@ func (r *MachineBackendReconciler) PatchDevMachine(ctx context.Context, patchHel
 	}
 
 	return patchHelper.Patch(ctx, inMemoryMachine,
-		patch.WithOwnedV1beta1Conditions{Conditions: []clusterv1.ConditionType{
+		patch.WithOwnedV1Beta1Conditions{Conditions: []clusterv1.ConditionType{
 			clusterv1.ReadyV1Beta1Condition,
 			infrav1.VMProvisionedCondition,
 			infrav1.NodeProvisionedCondition,
diff --git a/test/infrastructure/docker/internal/controllers/dockercluster_controller.go b/test/infrastructure/docker/internal/controllers/dockercluster_controller.go
@@ -182,7 +182,7 @@ func patchDockerCluster(ctx context.Context, patchHelper *patch.Helper, dockerCl
 	return patchHelper.Patch(
 		ctx,
 		dockerCluster,
-		patch.WithOwnedV1beta1Conditions{Conditions: []clusterv1.ConditionType{
+		patch.WithOwnedV1Beta1Conditions{Conditions: []clusterv1.ConditionType{
 			clusterv1.ReadyV1Beta1Condition,
 			infrav1.LoadBalancerAvailableCondition,
 		}},
diff --git a/test/infrastructure/docker/internal/controllers/dockermachine_controller.go b/test/infrastructure/docker/internal/controllers/dockermachine_controller.go
@@ -279,7 +279,7 @@ func patchDockerMachine(ctx context.Context, patchHelper *patch.Helper, dockerMa
 	return patchHelper.Patch(
 		ctx,
 		dockerMachine,
-		patch.WithOwnedV1beta1Conditions{Conditions: []clusterv1.ConditionType{
+		patch.WithOwnedV1Beta1Conditions{Conditions: []clusterv1.ConditionType{
 			clusterv1.ReadyV1Beta1Condition,
 			infrav1.ContainerProvisionedCondition,
 			infrav1.BootstrapExecSucceededCondition,
diff --git a/util/patch/options.go b/util/patch/options.go
@@ -75,14 +75,14 @@ func (w WithStatusObservedGeneration) ApplyToHelper(in *HelperOptions) {
 	in.IncludeStatusObservedGeneration = true
 }
 
-// WithOwnedV1beta1Conditions allows to define condition types owned by the controller.
+// WithOwnedV1Beta1Conditions allows to define condition types owned by the controller.
 // In case of conflicts for the owned conditions, the patch helper will always use the value provided by the controller.
-type WithOwnedV1beta1Conditions struct {
+type WithOwnedV1Beta1Conditions struct {
 	Conditions []clusterv1.ConditionType
 }
 
 // ApplyToHelper applies this configuration to the given HelperOptions.
-func (w WithOwnedV1beta1Conditions) ApplyToHelper(in *HelperOptions) {
+func (w WithOwnedV1Beta1Conditions) ApplyToHelper(in *HelperOptions) {
 	in.OwnedConditions = w.Conditions
 }
 
diff --git a/util/patch/patch_test.go b/util/patch/patch_test.go
@@ -1335,7 +1335,7 @@ func TestPatchHelperForV1beta2Transition(t *testing.T) {
 			v1beta1conditions.MarkTrue(obj, clusterv1.ConditionType("Ready"))
 
 			t.Log("Patching the object")
-			g.Expect(patcher.Patch(ctx, obj, WithOwnedV1beta1Conditions{Conditions: []clusterv1.ConditionType{clusterv1.ConditionType("Ready")}})).To(Succeed())
+			g.Expect(patcher.Patch(ctx, obj, WithOwnedV1Beta1Conditions{Conditions: []clusterv1.ConditionType{clusterv1.ConditionType("Ready")}})).To(Succeed())
 
 			t.Log("Validating the object has been updated")
 			readyBefore := v1beta1conditions.Get(obj, clusterv1.ConditionType("Ready"))
@@ -1835,7 +1835,7 @@ func TestPatchHelperForV1beta2Transition(t *testing.T) {
 			conditions.Set(obj, metav1.Condition{Type: "Ready", Status: metav1.ConditionTrue, Reason: "AllGood", LastTransitionTime: now})
 
 			t.Log("Patching the object")
-			g.Expect(patcher.Patch(ctx, obj, WithOwnedV1beta1Conditions{Conditions: []clusterv1.ConditionType{clusterv1.ConditionType("Ready")}}, WithOwnedConditions{Conditions: []string{"Ready"}})).To(Succeed())
+			g.Expect(patcher.Patch(ctx, obj, WithOwnedV1Beta1Conditions{Conditions: []clusterv1.ConditionType{clusterv1.ConditionType("Ready")}}, WithOwnedConditions{Conditions: []string{"Ready"}})).To(Succeed())
 
 			t.Log("Validating the object has been updated")
 			g.Eventually(func() bool {
@@ -2375,7 +2375,7 @@ func TestPatchHelperForV1beta2Transition(t *testing.T) {
 			conditions.Set(obj, metav1.Condition{Type: "Ready", Status: metav1.ConditionTrue, Reason: "AllGood", LastTransitionTime: now})
 
 			t.Log("Patching the object")
-			g.Expect(patcher.Patch(ctx, obj, WithOwnedV1beta1Conditions{Conditions: []clusterv1.ConditionType{clusterv1.ConditionType("Ready")}}, WithOwnedConditions{Conditions: []string{"Ready"}})).To(Succeed())
+			g.Expect(patcher.Patch(ctx, obj, WithOwnedV1Beta1Conditions{Conditions: []clusterv1.ConditionType{clusterv1.ConditionType("Ready")}}, WithOwnedConditions{Conditions: []string{"Ready"}})).To(Succeed())
 
 			t.Log("Validating the object has been updated")
 			g.Eventually(func() bool {

Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ func (r *KubeadmConfigReconciler) Reconcile(ctx context.Context, req ctrl.Reques`
`255`	`255`	`}`
`256`	`256`	`// Patch ObservedGeneration only if the reconciliation completed successfully`
`257`	`257`	`patchOpts := []patch.Option{`
`258`		`- patch.WithOwnedV1beta1Conditions{Conditions: []clusterv1.ConditionType{`
	`258`	`+ patch.WithOwnedV1Beta1Conditions{Conditions: []clusterv1.ConditionType{`
`259`	`259`	`clusterv1.ReadyV1Beta1Condition,`
`260`	`260`	`bootstrapv1.DataSecretAvailableV1Beta1Condition,`
`261`	`261`	`bootstrapv1.CertificatesAvailableV1Beta1Condition,`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ func patchExtensionConfig(ctx context.Context, client client.Client, original, m`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`options = append(options,`
`182`		`- patch.WithOwnedV1beta1Conditions{Conditions: []clusterv1.ConditionType{`
	`182`	`+ patch.WithOwnedV1Beta1Conditions{Conditions: []clusterv1.ConditionType{`
`183`	`183`	`runtimev1.RuntimeExtensionDiscoveredV1Beta1Condition,`
`184`	`184`	`}},`
`185`	`185`	`patch.WithOwnedConditions{Conditions: []string{`