From 818238ae74f53755302827f1af4bdd7ed13496bb Mon Sep 17 00:00:00 2001 From: tanjunchen Date: Fri, 2 Oct 2020 08:54:29 -0700 Subject: [PATCH] test/e2e/framework/:use the term 'Control Plane' in comment --- test/e2e/framework/ingress/ingress_utils.go | 4 ++-- test/e2e/framework/node/resource.go | 4 ++-- test/e2e/framework/node/wait.go | 6 ++---- test/e2e/framework/ssh/ssh.go | 4 ++-- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/test/e2e/framework/ingress/ingress_utils.go b/test/e2e/framework/ingress/ingress_utils.go index 8328e2a2995..923ab8251b5 100644 --- a/test/e2e/framework/ingress/ingress_utils.go +++ b/test/e2e/framework/ingress/ingress_utils.go @@ -883,8 +883,8 @@ func getPortURL(client clientset.Interface, ns, name string, svcPort int) (strin if err != nil { return "", err } - // This list of nodes must not include the master, which is marked - // unschedulable, since the master doesn't run kube-proxy. Without + // This list of nodes must not include the any control plane nodes, which are marked + // unschedulable, since control plane nodes don't run kube-proxy. Without // kube-proxy NodePorts won't work. var nodes *v1.NodeList if wait.PollImmediate(poll, framework.SingleCallTimeout, func() (bool, error) { diff --git a/test/e2e/framework/node/resource.go b/test/e2e/framework/node/resource.go index f5e08fd1c0d..012d033c95e 100644 --- a/test/e2e/framework/node/resource.go +++ b/test/e2e/framework/node/resource.go @@ -191,7 +191,7 @@ func Filter(nodeList *v1.NodeList, fn func(node v1.Node) bool) { nodeList.Items = l } -// TotalRegistered returns number of registered Nodes excluding Master Node. +// TotalRegistered returns number of schedulable Nodes. func TotalRegistered(c clientset.Interface) (int, error) { nodes, err := waitListSchedulableNodes(c) if err != nil { @@ -201,7 +201,7 @@ func TotalRegistered(c clientset.Interface) (int, error) { return len(nodes.Items), nil } -// TotalReady returns number of ready Nodes excluding Master Node. +// TotalReady returns number of ready schedulable Nodes. func TotalReady(c clientset.Interface) (int, error) { nodes, err := waitListSchedulableNodes(c) if err != nil { diff --git a/test/e2e/framework/node/wait.go b/test/e2e/framework/node/wait.go index 4c9d06dbbd6..839a728dcc6 100644 --- a/test/e2e/framework/node/wait.go +++ b/test/e2e/framework/node/wait.go @@ -40,8 +40,7 @@ var requiredPerNodePods = []*regexp.Regexp{ } // WaitForReadyNodes waits up to timeout for cluster to has desired size and -// there is no not-ready nodes in it. By cluster size we mean number of Nodes -// excluding Master Node. +// there is no not-ready nodes in it. By cluster size we mean number of schedulable Nodes. func WaitForReadyNodes(c clientset.Interface, size int, timeout time.Duration) error { _, err := CheckReady(c, size, timeout) return err @@ -149,8 +148,7 @@ func WaitForNodeToBeReady(c clientset.Interface, name string, timeout time.Durat } // CheckReady waits up to timeout for cluster to has desired size and -// there is no not-ready nodes in it. By cluster size we mean number of Nodes -// excluding Master Node. +// there is no not-ready nodes in it. By cluster size we mean number of schedulable Nodes. func CheckReady(c clientset.Interface, size int, timeout time.Duration) ([]v1.Node, error) { for start := time.Now(); time.Since(start) < timeout; time.Sleep(sleepTime) { nodes, err := waitListSchedulableNodes(c) diff --git a/test/e2e/framework/ssh/ssh.go b/test/e2e/framework/ssh/ssh.go index 302d764199d..cc216a23a6d 100644 --- a/test/e2e/framework/ssh/ssh.go +++ b/test/e2e/framework/ssh/ssh.go @@ -112,8 +112,8 @@ func makePrivateKeySignerFromFile(key string) (ssh.Signer, error) { return signer, err } -// NodeSSHHosts returns SSH-able host names for all schedulable nodes - this -// excludes master node. If it can't find any external IPs, it falls back to +// NodeSSHHosts returns SSH-able host names for all schedulable nodes. +// If it can't find any external IPs, it falls back to // looking for internal IPs. If it can't find an internal IP for every node it // returns an error, though it still returns all hosts that it found in that // case.