From 7af8c6acc446b9870860c1ec6cc8786348249062 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Thu, 28 Jun 2018 15:01:00 -0400 Subject: [PATCH] Make node status addresses authoritative for kube-apiserver -> kubelet connections --- pkg/util/node/node.go | 7 ------- pkg/util/node/node_test.go | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/pkg/util/node/node.go b/pkg/util/node/node.go index 6bc3ea8a777..9b036b70e39 100644 --- a/pkg/util/node/node.go +++ b/pkg/util/node/node.go @@ -64,13 +64,6 @@ func GetPreferredNodeAddress(node *v1.Node, preferredAddressTypes []v1.NodeAddre return address.Address, nil } } - // If hostname was requested and no Hostname address was registered... - if addressType == v1.NodeHostName { - // ...fall back to the kubernetes.io/hostname label for compatibility with kubelets before 1.5 - if hostname, ok := node.Labels[kubeletapis.LabelHostname]; ok && len(hostname) > 0 { - return hostname, nil - } - } } return "", fmt.Errorf("no preferred addresses found; known addresses: %v", node.Status.Addresses) } diff --git a/pkg/util/node/node_test.go b/pkg/util/node/node_test.go index b59f355a1bd..a1903eeacc5 100644 --- a/pkg/util/node/node_test.go +++ b/pkg/util/node/node_test.go @@ -61,13 +61,13 @@ func TestGetPreferredAddress(t *testing.T) { Preferences: []v1.NodeAddressType{v1.NodeHostName, v1.NodeExternalIP}, ExpectAddress: "status-hostname", }, - "found label address": { + "label address ignored": { Labels: map[string]string{kubeletapis.LabelHostname: "label-hostname"}, Addresses: []v1.NodeAddress{ {Type: v1.NodeExternalIP, Address: "1.2.3.5"}, }, Preferences: []v1.NodeAddressType{v1.NodeHostName, v1.NodeExternalIP}, - ExpectAddress: "label-hostname", + ExpectAddress: "1.2.3.5", }, }