diff --git a/cmd/clusterctl/client/cluster/mover.go b/cmd/clusterctl/client/cluster/mover.go index 98e3462848c0..433651d7d4bd 100644 --- a/cmd/clusterctl/client/cluster/mover.go +++ b/cmd/clusterctl/client/cluster/mover.go @@ -1031,7 +1031,7 @@ func (o *objectMover) restoreTargetObject(nodeToCreate *node, toProxy Proxy) err if err := cTo.Get(ctx, objKey, existingTargetObj); err == nil { log.V(5).Info("Object already exists, skipping moving from directory", nodeToCreate.identity.Kind, nodeToCreate.identity.Name, "Namespace", nodeToCreate.identity.Namespace) - // Update the nodes UID since it already exits. Any nodes owned by this existing node will be updated when the owner chain is rebuilt + // Update the nodes UID since it already exists. Any nodes owned by this existing node will be updated when the owner chain is rebuilt nodeToCreate.newUID = existingTargetObj.GetUID() // Return early since the object already exists diff --git a/cmd/clusterctl/client/clusterclass.go b/cmd/clusterctl/client/clusterclass.go index bb0872a29405..d0e431599a96 100644 --- a/cmd/clusterctl/client/clusterclass.go +++ b/cmd/clusterctl/client/clusterclass.go @@ -114,7 +114,7 @@ func fetchMissingClusterClassTemplates(clusterClassClient repository.ClusterClas } // Get the templates for all ClusterClasses and associated objects if the target - // ClusterClass does not exits in the cluster. + // ClusterClass does not exist in the cluster. templates := []repository.Template{} for _, class := range classes { if clusterInitialized { diff --git a/internal/controllers/topology/cluster/patches/variables/merge.go b/internal/controllers/topology/cluster/patches/variables/merge.go index 3c1259635f82..72afb411c4fa 100644 --- a/internal/controllers/topology/cluster/patches/variables/merge.go +++ b/internal/controllers/topology/cluster/patches/variables/merge.go @@ -32,7 +32,7 @@ func MergeVariableMaps(variableMaps ...map[string]apiextensionsv1.JSON) (map[str for _, variableMap := range variableMaps { for variableName, variableValue := range variableMap { - // If the variable already exits and is the builtin variable, merge it. + // If the variable already exists and is the builtin variable, merge it. if _, ok := res[variableName]; ok && variableName == BuiltinsName { mergedV, err := mergeBuiltinVariables(res[variableName], variableValue) if err != nil {