From 488b94767c4a7ba93fa21bcc42c7bd4e4eca6ffb Mon Sep 17 00:00:00 2001 From: tanjunchen <2799194073@qq.com> Date: Fri, 27 Dec 2019 11:45:18 +0800 Subject: [PATCH] remove TODO: Use return type string instead of []string and update func --- test/e2e/framework/network/utils.go | 11 +++++------ test/e2e/framework/node/resource.go | 9 +++------ test/e2e/network/firewall.go | 10 +++++----- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/test/e2e/framework/network/utils.go b/test/e2e/framework/network/utils.go index 72c8fc7dc79..003626c7531 100644 --- a/test/e2e/framework/network/utils.go +++ b/test/e2e/framework/network/utils.go @@ -129,7 +129,7 @@ type NetworkingTestConfig struct { // spanning over all endpointPods. SessionAffinityService *v1.Service // ExternalAddrs is a list of external IPs of nodes in the cluster. - ExternalAddrs []string + ExternalAddr string // Nodes is a list of nodes in the cluster. Nodes []v1.Node // MaxTries is the number of retries tolerated for tests run against @@ -617,7 +617,7 @@ func (config *NetworkingTestConfig) setup(selector map[string]string) { framework.ExpectNoError(framework.WaitForAllNodesSchedulable(config.f.ClientSet, 10*time.Minute)) nodeList, err := e2enode.GetReadySchedulableNodes(config.f.ClientSet) framework.ExpectNoError(err) - config.ExternalAddrs = e2enode.FirstAddress(nodeList, v1.NodeExternalIP) + config.ExternalAddr = e2enode.FirstAddress(nodeList, v1.NodeExternalIP) framework.SkipUnlessNodeCountIsAtLeast(2) config.Nodes = nodeList.Items @@ -637,11 +637,10 @@ func (config *NetworkingTestConfig) setup(selector map[string]string) { } } config.ClusterIP = config.NodePortService.Spec.ClusterIP - if len(config.ExternalAddrs) != 0 { - config.NodeIP = config.ExternalAddrs[0] + if config.ExternalAddr != "" { + config.NodeIP = config.ExternalAddr } else { - internalAddrs := e2enode.FirstAddress(nodeList, v1.NodeInternalIP) - config.NodeIP = internalAddrs[0] + config.NodeIP = e2enode.FirstAddress(nodeList, v1.NodeInternalIP) } } diff --git a/test/e2e/framework/node/resource.go b/test/e2e/framework/node/resource.go index 7601f03db38..aed9550774d 100644 --- a/test/e2e/framework/node/resource.go +++ b/test/e2e/framework/node/resource.go @@ -59,18 +59,15 @@ type PodNode struct { } // FirstAddress returns the first address of the given type of each node. -// TODO: Use return type string instead of []string -func FirstAddress(nodelist *v1.NodeList, addrType v1.NodeAddressType) []string { - hosts := []string{} +func FirstAddress(nodelist *v1.NodeList, addrType v1.NodeAddressType) string { for _, n := range nodelist.Items { for _, addr := range n.Status.Addresses { if addr.Type == addrType && addr.Address != "" { - hosts = append(hosts, addr.Address) - break + return addr.Address } } } - return hosts + return "" } // TODO: better to change to a easy read name diff --git a/test/e2e/network/firewall.go b/test/e2e/network/firewall.go index 49c08738df1..4c91039be75 100644 --- a/test/e2e/network/firewall.go +++ b/test/e2e/network/firewall.go @@ -206,8 +206,8 @@ var _ = SIGDescribe("Firewall rule", func() { } ginkgo.By("Checking well known ports on master and nodes are not exposed externally") - nodeAddrs := e2enode.FirstAddress(nodes, v1.NodeExternalIP) - if len(nodeAddrs) == 0 { + nodeAddr := e2enode.FirstAddress(nodes, v1.NodeExternalIP) + if nodeAddr == "" { framework.Failf("did not find any node addresses") } @@ -216,9 +216,9 @@ var _ = SIGDescribe("Firewall rule", func() { assertNotReachableHTTPTimeout(masterAddress, ports.InsecureKubeControllerManagerPort, firewallTestTCPTimeout) assertNotReachableHTTPTimeout(masterAddress, ports.InsecureSchedulerPort, firewallTestTCPTimeout) } - assertNotReachableHTTPTimeout(nodeAddrs[0], ports.KubeletPort, firewallTestTCPTimeout) - assertNotReachableHTTPTimeout(nodeAddrs[0], ports.KubeletReadOnlyPort, firewallTestTCPTimeout) - assertNotReachableHTTPTimeout(nodeAddrs[0], ports.ProxyStatusPort, firewallTestTCPTimeout) + assertNotReachableHTTPTimeout(nodeAddr, ports.KubeletPort, firewallTestTCPTimeout) + assertNotReachableHTTPTimeout(nodeAddr, ports.KubeletReadOnlyPort, firewallTestTCPTimeout) + assertNotReachableHTTPTimeout(nodeAddr, ports.ProxyStatusPort, firewallTestTCPTimeout) }) })