From 7d00e5cfb66d4501879125f4d3c732f9bb726d0c Mon Sep 17 00:00:00 2001 From: NickrenREN Date: Mon, 24 Apr 2017 10:21:29 +0800 Subject: [PATCH] remove deprecated NodeLegacyHostIP --- cmd/kube-apiserver/app/options/options.go | 2 -- federation/pkg/kubefed/init/init.go | 1 - pkg/api/types.go | 14 +++++--------- pkg/api/v1/types.go | 12 +++++------- pkg/api/validation/validation_test.go | 16 ++++++++-------- pkg/cloudprovider/providers/aws/aws.go | 5 ----- pkg/cloudprovider/providers/aws/aws_test.go | 5 ++--- pkg/cloudprovider/providers/mesos/mesos.go | 1 - pkg/cloudprovider/providers/ovirt/ovirt.go | 1 - .../providers/rackspace/rackspace.go | 1 - pkg/kubelet/kubelet_node_status.go | 1 - pkg/kubelet/kubelet_node_status_test.go | 3 --- pkg/master/master.go | 1 - pkg/master/master_test.go | 10 ---------- pkg/printers/internalversion/printers_test.go | 1 - pkg/util/node/node.go | 8 -------- staging/src/k8s.io/client-go/pkg/api/types.go | 14 +++++--------- staging/src/k8s.io/client-go/pkg/api/v1/types.go | 12 +++++------- test/e2e/framework/networking_utils.go | 5 +---- test/e2e/framework/service_util.go | 3 --- test/e2e/service.go | 3 --- 21 files changed, 31 insertions(+), 88 deletions(-) diff --git a/cmd/kube-apiserver/app/options/options.go b/cmd/kube-apiserver/app/options/options.go index 5d8ee77f13..921f5a643b 100644 --- a/cmd/kube-apiserver/app/options/options.go +++ b/cmd/kube-apiserver/app/options/options.go @@ -102,8 +102,6 @@ func NewServerRunOptions() *ServerRunOptions { // external, preferring DNS if reported string(api.NodeExternalDNS), string(api.NodeExternalIP), - - string(api.NodeLegacyHostIP), }, EnableHttps: true, HTTPTimeout: time.Duration(5) * time.Second, diff --git a/federation/pkg/kubefed/init/init.go b/federation/pkg/kubefed/init/init.go index d4420bdb73..4c1dcbe388 100644 --- a/federation/pkg/kubefed/init/init.go +++ b/federation/pkg/kubefed/init/init.go @@ -483,7 +483,6 @@ func createService(clientset client.Interface, namespace, svcName, federationNam func getClusterNodeIPs(clientset client.Interface) ([]string, error) { preferredAddressTypes := []api.NodeAddressType{ api.NodeExternalIP, - api.NodeLegacyHostIP, } nodeList, err := clientset.Core().Nodes().List(metav1.ListOptions{}) if err != nil { diff --git a/pkg/api/types.go b/pkg/api/types.go index 8f4cf5e3a7..aecc8e3731 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -2904,16 +2904,12 @@ type NodeCondition struct { type NodeAddressType string -// These are valid address types of node. NodeLegacyHostIP is used to transit -// from out-dated HostIP field to NodeAddress. const ( - // Deprecated: NodeLegacyHostIP will be removed in 1.7. - NodeLegacyHostIP NodeAddressType = "LegacyHostIP" - NodeHostName NodeAddressType = "Hostname" - NodeExternalIP NodeAddressType = "ExternalIP" - NodeInternalIP NodeAddressType = "InternalIP" - NodeExternalDNS NodeAddressType = "ExternalDNS" - NodeInternalDNS NodeAddressType = "InternalDNS" + NodeHostName NodeAddressType = "Hostname" + NodeExternalIP NodeAddressType = "ExternalIP" + NodeInternalIP NodeAddressType = "InternalIP" + NodeExternalDNS NodeAddressType = "ExternalDNS" + NodeInternalDNS NodeAddressType = "InternalDNS" ) type NodeAddress struct { diff --git a/pkg/api/v1/types.go b/pkg/api/v1/types.go index 461e27dc47..b55516bb64 100644 --- a/pkg/api/v1/types.go +++ b/pkg/api/v1/types.go @@ -3345,13 +3345,11 @@ type NodeAddressType string // These are valid address type of node. const ( - // Deprecated: NodeLegacyHostIP will be removed in 1.7. - NodeLegacyHostIP NodeAddressType = "LegacyHostIP" - NodeHostName NodeAddressType = "Hostname" - NodeExternalIP NodeAddressType = "ExternalIP" - NodeInternalIP NodeAddressType = "InternalIP" - NodeExternalDNS NodeAddressType = "ExternalDNS" - NodeInternalDNS NodeAddressType = "InternalDNS" + NodeHostName NodeAddressType = "Hostname" + NodeExternalIP NodeAddressType = "ExternalIP" + NodeInternalIP NodeAddressType = "InternalIP" + NodeExternalDNS NodeAddressType = "ExternalDNS" + NodeInternalDNS NodeAddressType = "InternalDNS" ) // NodeAddress contains information for the node's address. diff --git a/pkg/api/validation/validation_test.go b/pkg/api/validation/validation_test.go index bdad6cfedf..149c68cf58 100644 --- a/pkg/api/validation/validation_test.go +++ b/pkg/api/validation/validation_test.go @@ -6244,7 +6244,7 @@ func TestValidateNode(t *testing.T) { }, Status: api.NodeStatus{ Addresses: []api.NodeAddress{ - {Type: api.NodeLegacyHostIP, Address: "something"}, + {Type: api.NodeExternalIP, Address: "something"}, }, Capacity: api.ResourceList{ api.ResourceName(api.ResourceCPU): resource.MustParse("10"), @@ -6262,7 +6262,7 @@ func TestValidateNode(t *testing.T) { }, Status: api.NodeStatus{ Addresses: []api.NodeAddress{ - {Type: api.NodeLegacyHostIP, Address: "something"}, + {Type: api.NodeExternalIP, Address: "something"}, }, Capacity: api.ResourceList{ api.ResourceName(api.ResourceCPU): resource.MustParse("10"), @@ -6279,7 +6279,7 @@ func TestValidateNode(t *testing.T) { }, Status: api.NodeStatus{ Addresses: []api.NodeAddress{ - {Type: api.NodeLegacyHostIP, Address: "something"}, + {Type: api.NodeExternalIP, Address: "something"}, }, Capacity: api.ResourceList{ api.ResourceName(api.ResourceCPU): resource.MustParse("10"), @@ -6318,7 +6318,7 @@ func TestValidateNode(t *testing.T) { }, Status: api.NodeStatus{ Addresses: []api.NodeAddress{ - {Type: api.NodeLegacyHostIP, Address: "something"}, + {Type: api.NodeExternalIP, Address: "something"}, }, Capacity: api.ResourceList{ api.ResourceName(api.ResourceCPU): resource.MustParse("10"), @@ -6406,7 +6406,7 @@ func TestValidateNode(t *testing.T) { }, Status: api.NodeStatus{ Addresses: []api.NodeAddress{ - {Type: api.NodeLegacyHostIP, Address: "something"}, + {Type: api.NodeExternalIP, Address: "something"}, }, Capacity: api.ResourceList{ api.ResourceName(api.ResourceCPU): resource.MustParse("10"), @@ -6425,7 +6425,7 @@ func TestValidateNode(t *testing.T) { }, Status: api.NodeStatus{ Addresses: []api.NodeAddress{ - {Type: api.NodeLegacyHostIP, Address: "something"}, + {Type: api.NodeExternalIP, Address: "something"}, }, Capacity: api.ResourceList{ api.ResourceName(api.ResourceCPU): resource.MustParse("10"), @@ -6444,7 +6444,7 @@ func TestValidateNode(t *testing.T) { }, Status: api.NodeStatus{ Addresses: []api.NodeAddress{ - {Type: api.NodeLegacyHostIP, Address: "something"}, + {Type: api.NodeExternalIP, Address: "something"}, }, Capacity: api.ResourceList{ api.ResourceName(api.ResourceCPU): resource.MustParse("10"), @@ -6687,7 +6687,7 @@ func TestValidateNodeUpdate(t *testing.T) { }, Status: api.NodeStatus{ Addresses: []api.NodeAddress{ - {Type: api.NodeLegacyHostIP, Address: "1.2.3.4"}, + {Type: api.NodeExternalIP, Address: "1.2.3.4"}, }, }, }, api.Node{ diff --git a/pkg/cloudprovider/providers/aws/aws.go b/pkg/cloudprovider/providers/aws/aws.go index 1909370a1b..d029cbd6b7 100644 --- a/pkg/cloudprovider/providers/aws/aws.go +++ b/pkg/cloudprovider/providers/aws/aws.go @@ -909,8 +909,6 @@ func (c *Cloud) NodeAddresses(name types.NodeName) ([]v1.NodeAddress, error) { return nil, err } addresses = append(addresses, v1.NodeAddress{Type: v1.NodeInternalIP, Address: internalIP}) - // Legacy compatibility: the private ip was the legacy host ip - addresses = append(addresses, v1.NodeAddress{Type: v1.NodeLegacyHostIP, Address: internalIP}) externalIP, err := c.metadata.GetMetadata("public-ipv4") if err != nil { @@ -955,9 +953,6 @@ func (c *Cloud) NodeAddresses(name types.NodeName) ([]v1.NodeAddress, error) { return nil, fmt.Errorf("EC2 instance had invalid private address: %s (%s)", orEmpty(instance.InstanceId), ipAddress) } addresses = append(addresses, v1.NodeAddress{Type: v1.NodeInternalIP, Address: ip.String()}) - - // Legacy compatibility: the private ip was the legacy host ip - addresses = append(addresses, v1.NodeAddress{Type: v1.NodeLegacyHostIP, Address: ip.String()}) } // TODO: Other IP addresses (multiple ips)? diff --git a/pkg/cloudprovider/providers/aws/aws_test.go b/pkg/cloudprovider/providers/aws/aws_test.go index c04545e1f6..11b896c52d 100644 --- a/pkg/cloudprovider/providers/aws/aws_test.go +++ b/pkg/cloudprovider/providers/aws/aws_test.go @@ -599,11 +599,10 @@ func TestNodeAddresses(t *testing.T) { if err3 != nil { t.Errorf("Should not error when instance found") } - if len(addrs3) != 5 { - t.Errorf("Should return exactly 5 NodeAddresses") + if len(addrs3) != 4 { + t.Errorf("Should return exactly 4 NodeAddresses") } testHasNodeAddress(t, addrs3, v1.NodeInternalIP, "192.168.0.1") - testHasNodeAddress(t, addrs3, v1.NodeLegacyHostIP, "192.168.0.1") testHasNodeAddress(t, addrs3, v1.NodeExternalIP, "1.2.3.4") testHasNodeAddress(t, addrs3, v1.NodeExternalDNS, "instance-same.ec2.external") testHasNodeAddress(t, addrs3, v1.NodeInternalDNS, "instance-same.ec2.internal") diff --git a/pkg/cloudprovider/providers/mesos/mesos.go b/pkg/cloudprovider/providers/mesos/mesos.go index 3dbe53014a..76d80e36c0 100644 --- a/pkg/cloudprovider/providers/mesos/mesos.go +++ b/pkg/cloudprovider/providers/mesos/mesos.go @@ -298,7 +298,6 @@ func (c *MesosCloud) NodeAddresses(nodeName types.NodeName) ([]v1.NodeAddress, e return nil, err } return []v1.NodeAddress{ - {Type: v1.NodeLegacyHostIP, Address: ip.String()}, {Type: v1.NodeInternalIP, Address: ip.String()}, {Type: v1.NodeExternalIP, Address: ip.String()}, }, nil diff --git a/pkg/cloudprovider/providers/ovirt/ovirt.go b/pkg/cloudprovider/providers/ovirt/ovirt.go index ee3f7b4366..b0257cbc83 100644 --- a/pkg/cloudprovider/providers/ovirt/ovirt.go +++ b/pkg/cloudprovider/providers/ovirt/ovirt.go @@ -174,7 +174,6 @@ func (v *OVirtCloud) NodeAddresses(nodeName types.NodeName) ([]v1.NodeAddress, e } return []v1.NodeAddress{ - {Type: v1.NodeLegacyHostIP, Address: address.String()}, {Type: v1.NodeInternalIP, Address: address.String()}, {Type: v1.NodeExternalIP, Address: address.String()}, }, nil diff --git a/pkg/cloudprovider/providers/rackspace/rackspace.go b/pkg/cloudprovider/providers/rackspace/rackspace.go index 532c04dbd1..3e9ac3f8ff 100644 --- a/pkg/cloudprovider/providers/rackspace/rackspace.go +++ b/pkg/cloudprovider/providers/rackspace/rackspace.go @@ -381,7 +381,6 @@ func (i *Instances) NodeAddresses(nodeName types.NodeName) ([]v1.NodeAddress, er // net.ParseIP().String() is to maintain compatibility with the old code parsedIP := net.ParseIP(ip).String() return []v1.NodeAddress{ - {Type: v1.NodeLegacyHostIP, Address: parsedIP}, {Type: v1.NodeInternalIP, Address: parsedIP}, {Type: v1.NodeExternalIP, Address: parsedIP}, }, nil diff --git a/pkg/kubelet/kubelet_node_status.go b/pkg/kubelet/kubelet_node_status.go index b66bc6a002..38fd156289 100644 --- a/pkg/kubelet/kubelet_node_status.go +++ b/pkg/kubelet/kubelet_node_status.go @@ -465,7 +465,6 @@ func (kl *Kubelet) setNodeAddress(node *v1.Node) error { return fmt.Errorf("can't get ip address of node %s. error: %v", node.Name, err) } else { node.Status.Addresses = []v1.NodeAddress{ - {Type: v1.NodeLegacyHostIP, Address: ipAddr.String()}, {Type: v1.NodeInternalIP, Address: ipAddr.String()}, {Type: v1.NodeHostName, Address: kl.GetHostname()}, } diff --git a/pkg/kubelet/kubelet_node_status_test.go b/pkg/kubelet/kubelet_node_status_test.go index bfe9c9bd23..7a4b021ae0 100644 --- a/pkg/kubelet/kubelet_node_status_test.go +++ b/pkg/kubelet/kubelet_node_status_test.go @@ -218,7 +218,6 @@ func TestUpdateNewNodeStatus(t *testing.T) { v1.ResourcePods: *resource.NewQuantity(0, resource.DecimalSI), }, Addresses: []v1.NodeAddress{ - {Type: v1.NodeLegacyHostIP, Address: "127.0.0.1"}, {Type: v1.NodeInternalIP, Address: "127.0.0.1"}, {Type: v1.NodeHostName, Address: testKubeletHostname}, }, @@ -455,7 +454,6 @@ func TestUpdateExistingNodeStatus(t *testing.T) { v1.ResourcePods: *resource.NewQuantity(0, resource.DecimalSI), }, Addresses: []v1.NodeAddress{ - {Type: v1.NodeLegacyHostIP, Address: "127.0.0.1"}, {Type: v1.NodeInternalIP, Address: "127.0.0.1"}, {Type: v1.NodeHostName, Address: testKubeletHostname}, }, @@ -739,7 +737,6 @@ func TestUpdateNodeStatusWithRuntimeStateError(t *testing.T) { v1.ResourcePods: *resource.NewQuantity(0, resource.DecimalSI), }, Addresses: []v1.NodeAddress{ - {Type: v1.NodeLegacyHostIP, Address: "127.0.0.1"}, {Type: v1.NodeInternalIP, Address: "127.0.0.1"}, {Type: v1.NodeHostName, Address: testKubeletHostname}, }, diff --git a/pkg/master/master.go b/pkg/master/master.go index bea6e93af9..19ae387cec 100644 --- a/pkg/master/master.go +++ b/pkg/master/master.go @@ -349,7 +349,6 @@ type nodeAddressProvider struct { func (n nodeAddressProvider) externalAddresses() ([]string, error) { preferredAddressTypes := []apiv1.NodeAddressType{ apiv1.NodeExternalIP, - apiv1.NodeLegacyHostIP, } nodes, err := n.nodeClient.List(metav1.ListOptions{}) if err != nil { diff --git a/pkg/master/master_test.go b/pkg/master/master_test.go index f9b45c143c..ca84297dbc 100644 --- a/pkg/master/master_test.go +++ b/pkg/master/master_test.go @@ -205,16 +205,6 @@ func TestGetNodeAddresses(t *testing.T) { addrs, err = addressProvider.externalAddresses() assert.NoError(err, "addresses should not have returned an error.") assert.Equal([]string{"127.0.0.1", "127.0.0.1"}, addrs) - - // Pass case with LegacyHost type IP - nodes, _ = fakeNodeClient.List(metav1.ListOptions{}) - for index := range nodes.Items { - nodes.Items[index].Status.Addresses = []apiv1.NodeAddress{{Type: apiv1.NodeLegacyHostIP, Address: "127.0.0.2"}} - fakeNodeClient.Update(&nodes.Items[index]) - } - addrs, err = addressProvider.externalAddresses() - assert.NoError(err, "addresses failback should not have returned an error.") - assert.Equal([]string{"127.0.0.2", "127.0.0.2"}, addrs) } func decodeResponse(resp *http.Response, obj interface{}) error { diff --git a/pkg/printers/internalversion/printers_test.go b/pkg/printers/internalversion/printers_test.go index 5fdb091072..85276c4f23 100644 --- a/pkg/printers/internalversion/printers_test.go +++ b/pkg/printers/internalversion/printers_test.go @@ -852,7 +852,6 @@ func TestPrintNodeExternalIP(t *testing.T) { node: api.Node{ ObjectMeta: metav1.ObjectMeta{Name: "foo3"}, Status: api.NodeStatus{Addresses: []api.NodeAddress{ - {Type: api.NodeLegacyHostIP, Address: "1.1.1.1"}, {Type: api.NodeExternalIP, Address: "2.2.2.2"}, {Type: api.NodeInternalIP, Address: "3.3.3.3"}, {Type: api.NodeExternalIP, Address: "4.4.4.4"}, diff --git a/pkg/util/node/node.go b/pkg/util/node/node.go index aabea61b39..d47d54e16f 100644 --- a/pkg/util/node/node.go +++ b/pkg/util/node/node.go @@ -75,7 +75,6 @@ func GetPreferredNodeAddress(node *v1.Node, preferredAddressTypes []v1.NodeAddre // GetNodeHostIP returns the provided node's IP, based on the priority: // 1. NodeInternalIP // 2. NodeExternalIP -// 3. NodeLegacyHostIP func GetNodeHostIP(node *v1.Node) (net.IP, error) { addresses := node.Status.Addresses addressMap := make(map[v1.NodeAddressType][]v1.NodeAddress) @@ -88,16 +87,12 @@ func GetNodeHostIP(node *v1.Node) (net.IP, error) { if addresses, ok := addressMap[v1.NodeExternalIP]; ok { return net.ParseIP(addresses[0].Address), nil } - if addresses, ok := addressMap[v1.NodeLegacyHostIP]; ok { - return net.ParseIP(addresses[0].Address), nil - } return nil, fmt.Errorf("host IP unknown; known addresses: %v", addresses) } // InternalGetNodeHostIP returns the provided node's IP, based on the priority: // 1. NodeInternalIP // 2. NodeExternalIP -// 3. NodeLegacyHostIP func InternalGetNodeHostIP(node *api.Node) (net.IP, error) { addresses := node.Status.Addresses addressMap := make(map[api.NodeAddressType][]api.NodeAddress) @@ -110,9 +105,6 @@ func InternalGetNodeHostIP(node *api.Node) (net.IP, error) { if addresses, ok := addressMap[api.NodeExternalIP]; ok { return net.ParseIP(addresses[0].Address), nil } - if addresses, ok := addressMap[api.NodeLegacyHostIP]; ok { - return net.ParseIP(addresses[0].Address), nil - } return nil, fmt.Errorf("host IP unknown; known addresses: %v", addresses) } diff --git a/staging/src/k8s.io/client-go/pkg/api/types.go b/staging/src/k8s.io/client-go/pkg/api/types.go index 8f4cf5e3a7..aecc8e3731 100644 --- a/staging/src/k8s.io/client-go/pkg/api/types.go +++ b/staging/src/k8s.io/client-go/pkg/api/types.go @@ -2904,16 +2904,12 @@ type NodeCondition struct { type NodeAddressType string -// These are valid address types of node. NodeLegacyHostIP is used to transit -// from out-dated HostIP field to NodeAddress. const ( - // Deprecated: NodeLegacyHostIP will be removed in 1.7. - NodeLegacyHostIP NodeAddressType = "LegacyHostIP" - NodeHostName NodeAddressType = "Hostname" - NodeExternalIP NodeAddressType = "ExternalIP" - NodeInternalIP NodeAddressType = "InternalIP" - NodeExternalDNS NodeAddressType = "ExternalDNS" - NodeInternalDNS NodeAddressType = "InternalDNS" + NodeHostName NodeAddressType = "Hostname" + NodeExternalIP NodeAddressType = "ExternalIP" + NodeInternalIP NodeAddressType = "InternalIP" + NodeExternalDNS NodeAddressType = "ExternalDNS" + NodeInternalDNS NodeAddressType = "InternalDNS" ) type NodeAddress struct { diff --git a/staging/src/k8s.io/client-go/pkg/api/v1/types.go b/staging/src/k8s.io/client-go/pkg/api/v1/types.go index 461e27dc47..b55516bb64 100644 --- a/staging/src/k8s.io/client-go/pkg/api/v1/types.go +++ b/staging/src/k8s.io/client-go/pkg/api/v1/types.go @@ -3345,13 +3345,11 @@ type NodeAddressType string // These are valid address type of node. const ( - // Deprecated: NodeLegacyHostIP will be removed in 1.7. - NodeLegacyHostIP NodeAddressType = "LegacyHostIP" - NodeHostName NodeAddressType = "Hostname" - NodeExternalIP NodeAddressType = "ExternalIP" - NodeInternalIP NodeAddressType = "InternalIP" - NodeExternalDNS NodeAddressType = "ExternalDNS" - NodeInternalDNS NodeAddressType = "InternalDNS" + NodeHostName NodeAddressType = "Hostname" + NodeExternalIP NodeAddressType = "ExternalIP" + NodeInternalIP NodeAddressType = "InternalIP" + NodeExternalDNS NodeAddressType = "ExternalDNS" + NodeInternalDNS NodeAddressType = "InternalDNS" ) // NodeAddress contains information for the node's address. diff --git a/test/e2e/framework/networking_utils.go b/test/e2e/framework/networking_utils.go index c62260eae2..ca30f3848b 100644 --- a/test/e2e/framework/networking_utils.go +++ b/test/e2e/framework/networking_utils.go @@ -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 diff --git a/test/e2e/framework/service_util.go b/test/e2e/framework/service_util.go index 395b4dccbf..698d5859ac 100644 --- a/test/e2e/framework/service_util.go +++ b/test/e2e/framework/service_util.go @@ -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 } diff --git a/test/e2e/service.go b/test/e2e/service.go index 558fb8a56d..e3af70db46 100644 --- a/test/e2e/service.go +++ b/test/e2e/service.go @@ -1353,9 +1353,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)