github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 13:07:07 +00:00
Code Issues Projects Releases Wiki Activity

remove TODO: Use return type string instead of []string and update func

Browse Source
This commit is contained in:
tanjunchen 2019-12-27 11:45:18 +08:00
parent 305377a2f5
commit 488b94767c
3 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/e2e/framework/network/utils.go
View File

@ -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)
}
}

9
test/e2e/framework/node/resource.go
View File

@ -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

10
test/e2e/network/firewall.go
View File

@ -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)
})
})