Skip to content

Commit b685b09

Browse files
authored
Merge pull request kubernetes-sigs#9511 from killianmuldoon/pr-fix-typo
📖 Fixup `from` typo
2 parents 3b67cb7 + c637be8 commit b685b09

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

internal/controllers/machinedeployment/machinedeployment_sync.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ func (r *Reconciler) computeDesiredMachineSet(deployment *clusterv1.MachineDeplo
276276
// the finalizer on the MachineSet if it already exists. Because of SSA we should not build
277277
// the finalizer information from the MachineDeployment when updating a MachineSet because that could lead
278278
// to dropping the finalizer from the MachineSet if it is dropped from the MachineDeployment.
279-
// We should not drop the finalizer on the MachineSet if the finalizer is dropped form the MachineDeployment.
279+
// We should not drop the finalizer on the MachineSet if the finalizer is dropped from the MachineDeployment.
280280
if sets.New[string](existingMS.Finalizers...).Has(metav1.FinalizerDeleteDependents) {
281281
finalizers = []string{metav1.FinalizerDeleteDependents}
282282
}

internal/controllers/machineset/machineset_controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ func TestMachineSetReconciler(t *testing.T) {
297297
fakeInfrastructureRefReady(m.Spec.InfrastructureRef, infraResource, g)
298298
}
299299

300-
// Verify that in-place mutable fields propagate form MachineSet to Machines.
300+
// Verify that in-place mutable fields propagate from MachineSet to Machines.
301301
t.Log("Updating NodeDrainTimeout on MachineSet")
302302
patchHelper, err := patch.NewHelper(instance, env)
303303
g.Expect(err).ToNot(HaveOccurred())

internal/controllers/topology/cluster/conditions.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ func (r *Reconciler) reconcileTopologyReconciledCondition(s *scope.Scope, cluste
214214
return nil
215215
}
216216

217-
// computeNameList computes list of names form the given list to be shown in conditions.
217+
// computeNameList computes list of names from the given list to be shown in conditions.
218218
// It shortens the list to at most 5 names and adds an ellipsis at the end if the list
219219
// has more than 5 elements.
220220
func computeNameList(list []string) any {

test/framework/clusterctl/clusterctl_helpers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ func ApplyCustomClusterTemplateAndWait(ctx context.Context, input ApplyCustomClu
362362
Expect(input.Namespace).NotTo(BeEmpty(), "Invalid argument. input.Namespace can't be empty when calling ApplyCustomClusterTemplateAndWait")
363363
Expect(result).ToNot(BeNil(), "Invalid argument. result can't be nil when calling ApplyClusterTemplateAndWait")
364364

365-
log.Logf("Creating the workload cluster with name %q form the provided yaml", input.ClusterName)
365+
log.Logf("Creating the workload cluster with name %q from the provided yaml", input.ClusterName)
366366

367367
// Ensure we have a Cluster for dump and cleanup steps in AfterEach even if ApplyClusterTemplateAndWait fails.
368368
result.Cluster = &clusterv1.Cluster{

0 commit comments

Comments
 (0)