github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-11-02 06:47:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #44830 from NickrenREN/remove-NodeLegacyHostIP

Browse Source 
Automatic merge from submit-queue

Remove deprecated NodeLegacyHostIP

**Release note**:
```release-note
Remove deprecated node address type `NodeLegacyHostIP`.
```

ref #44807
This commit is contained in:
Kubernetes Submit Queue
2017-05-05 15:38:58 -07:00
committed by GitHub
parent 5b3d0bbe66 7d00e5cfb6
commit 17d33ea82e
21 changed files with 31 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e/framework/networking_utils.go
View File

@@ -476,10 +476,7 @@ func (config *NetworkingTestConfig) setup(selector map[string]string) {
ExpectNoError(WaitForAllNodesSchedulable(config.f.ClientSet, 10*time.Minute))
nodeList := GetReadySchedulableNodesOrDie(config.f.ClientSet)
config.ExternalAddrs = NodeAddresses(nodeList, v1.NodeExternalIP)
if len(config.ExternalAddrs) < 2 {
// fall back to legacy IPs
config.ExternalAddrs = NodeAddresses(nodeList, v1.NodeLegacyHostIP)
}
SkipUnlessNodeCountIsAtLeast(2)
config.Nodes = nodeList.Items

3
test/e2e/framework/service_util.go
View File

@@ -258,9 +258,6 @@ func GetNodePublicIps(c clientset.Interface) ([]string, error) {
nodes := GetReadySchedulableNodesOrDie(c)
ips := CollectAddresses(nodes, v1.NodeExternalIP)
if len(ips) == 0 {
ips = CollectAddresses(nodes, v1.NodeLegacyHostIP)
}
return ips, nil
}

3
test/e2e/service.go
View File

@@ -1356,9 +1356,6 @@ var _ = framework.KubeDescribe("ESIPP [Slow]", func() {
}
ips := framework.CollectAddresses(nodes, v1.NodeExternalIP)
if len(ips) == 0 {
ips = framework.CollectAddresses(nodes, v1.NodeLegacyHostIP)
}
ingressIP := framework.GetIngressPoint(&svc.Status.LoadBalancer.Ingress[0])
svcTCPPort := int(svc.Spec.Ports[0].Port)