Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

📖 Fixup from typo #9511

Merged
merged 1 commit into from
Sep 29, 2023
Merged

📖 Fixup from typo #9511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/controllers/machinedeployment/machinedeployment_sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ func (r *Reconciler) computeDesiredMachineSet(deployment *clusterv1.MachineDeplo
// the finalizer on the MachineSet if it already exists. Because of SSA we should not build
// the finalizer information from the MachineDeployment when updating a MachineSet because that could lead
// to dropping the finalizer from the MachineSet if it is dropped from the MachineDeployment.
// We should not drop the finalizer on the MachineSet if the finalizer is dropped form the MachineDeployment.
// We should not drop the finalizer on the MachineSet if the finalizer is dropped from the MachineDeployment.
if sets.New[string](existingMS.Finalizers...).Has(metav1.FinalizerDeleteDependents) {
finalizers = []string{metav1.FinalizerDeleteDependents}
}
Expand Down
2 changes: 1 addition & 1 deletion internal/controllers/machineset/machineset_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ func TestMachineSetReconciler(t *testing.T) {
fakeInfrastructureRefReady(m.Spec.InfrastructureRef, infraResource, g)
}

// Verify that in-place mutable fields propagate form MachineSet to Machines.
// Verify that in-place mutable fields propagate from MachineSet to Machines.
t.Log("Updating NodeDrainTimeout on MachineSet")
patchHelper, err := patch.NewHelper(instance, env)
g.Expect(err).ToNot(HaveOccurred())
Expand Down
2 changes: 1 addition & 1 deletion internal/controllers/topology/cluster/conditions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ func (r *Reconciler) reconcileTopologyReconciledCondition(s *scope.Scope, cluste
return nil
}

// computeNameList computes list of names form the given list to be shown in conditions.
// computeNameList computes list of names from the given list to be shown in conditions.
// It shortens the list to at most 5 names and adds an ellipsis at the end if the list
// has more than 5 elements.
func computeNameList(list []string) any {
Expand Down
2 changes: 1 addition & 1 deletion test/framework/clusterctl/clusterctl_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ func ApplyCustomClusterTemplateAndWait(ctx context.Context, input ApplyCustomClu
Expect(input.Namespace).NotTo(BeEmpty(), "Invalid argument. input.Namespace can't be empty when calling ApplyCustomClusterTemplateAndWait")
Expect(result).ToNot(BeNil(), "Invalid argument. result can't be nil when calling ApplyClusterTemplateAndWait")

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

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