diff --git a/cluster-autoscaler/simulator/cluster.go b/cluster-autoscaler/simulator/cluster.go index e4e0d2de20..35b57bd2bf 100644 --- a/cluster-autoscaler/simulator/cluster.go +++ b/cluster-autoscaler/simulator/cluster.go @@ -34,7 +34,7 @@ import ( var ( skipNodesWithSystemPods = flag.Bool("skip-nodes-with-system-pods", true, - "If true cluster autoscaler will never delete nodes with pods from kube-system (except for DeamonSet "+ + "If true cluster autoscaler will never delete nodes with pods from kube-system (except for DaemonSet "+ "or mirror pods)") skipNodesWithLocalStorage = flag.Bool("skip-nodes-with-local-storage", true, "If true cluster autoscaler will never delete nodes with pods with local storage, e.g. EmptyDir or HostPath") diff --git a/cluster-autoscaler/simulator/drain_test.go b/cluster-autoscaler/simulator/drain_test.go index b21b0d1b5d..c0711ada96 100644 --- a/cluster-autoscaler/simulator/drain_test.go +++ b/cluster-autoscaler/simulator/drain_test.go @@ -69,7 +69,7 @@ func TestFastGetPodsToMove(t *testing.T) { assert.NoError(t, err) assert.Equal(t, 0, len(r3)) - // DeamonSet pod + // DaemonSet pod pod4 := &apiv1.Pod{ ObjectMeta: metav1.ObjectMeta{ Name: "pod4", diff --git a/cluster-autoscaler/utils/drain/drain.go b/cluster-autoscaler/utils/drain/drain.go index ef5b8e462c..1504880162 100644 --- a/cluster-autoscaler/utils/drain/drain.go +++ b/cluster-autoscaler/utils/drain/drain.go @@ -34,7 +34,7 @@ const ( ) // GetPodsForDeletionOnNodeDrain returns pods that should be deleted on node drain as well as some extra information -// about possibly problematic pods (unreplicated and deamon sets). +// about possibly problematic pods (unreplicated and daemonsets). func GetPodsForDeletionOnNodeDrain( podList []*apiv1.Pod, decoder runtime.Decoder, @@ -106,7 +106,7 @@ func GetPodsForDeletionOnNodeDrain( // daemonset pods, probably using taints. daemonsetPod = true } else { - return []*apiv1.Pod{}, fmt.Errorf("deamonset for %s/%s is not present, err: %v", pod.Namespace, pod.Name, err) + return []*apiv1.Pod{}, fmt.Errorf("daemonset for %s/%s is not present, err: %v", pod.Namespace, pod.Name, err) } } else { daemonsetPod = true @@ -169,7 +169,7 @@ func GetPodsForDeletionOnNodeDrain( return []*apiv1.Pod{}, fmt.Errorf("%s/%s is not replicated", pod.Namespace, pod.Name) } if pod.Namespace == "kube-system" && skipNodesWithSystemPods { - return []*apiv1.Pod{}, fmt.Errorf("non-deamons set, non-mirrored, kube-system pod present: %s", pod.Name) + return []*apiv1.Pod{}, fmt.Errorf("non-daemonset, non-mirrored, kube-system pod present: %s", pod.Name) } if HasLocalStorage(pod) && skipNodesWithLocalStorage { return []*apiv1.Pod{}, fmt.Errorf("pod with local storage present: %s", pod.Name)