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

Make node status addresses authoritative for kube-apiserver -> kubelet connections

Browse Source
This commit is contained in:
Jordan Liggitt 2018-06-28 15:01:00 -04:00
parent 7828e5d0f9
commit 7af8c6acc4
No known key found for this signature in database
GPG Key ID: 39928704103C7229
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/util/node/node.go
View File

@ -64,13 +64,6 @@ func GetPreferredNodeAddress(node *v1.Node, preferredAddressTypes []v1.NodeAddre
return address.Address, nil 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) return "", fmt.Errorf("no preferred addresses found; known addresses: %v", node.Status.Addresses)
} }

4
pkg/util/node/node_test.go
View File

@ -61,13 +61,13 @@ func TestGetPreferredAddress(t *testing.T) {
Preferences: []v1.NodeAddressType{v1.NodeHostName, v1.NodeExternalIP}, Preferences: []v1.NodeAddressType{v1.NodeHostName, v1.NodeExternalIP},
ExpectAddress: "status-hostname", ExpectAddress: "status-hostname",
}, },
"found label address": { "label address ignored": {
Labels: map[string]string{kubeletapis.LabelHostname: "label-hostname"}, Labels: map[string]string{kubeletapis.LabelHostname: "label-hostname"},
Addresses: []v1.NodeAddress{ Addresses: []v1.NodeAddress{
{Type: v1.NodeExternalIP, Address: "1.2.3.5"}, {Type: v1.NodeExternalIP, Address: "1.2.3.5"},
}, },
Preferences: []v1.NodeAddressType{v1.NodeHostName, v1.NodeExternalIP}, Preferences: []v1.NodeAddressType{v1.NodeHostName, v1.NodeExternalIP},
ExpectAddress: "label-hostname", ExpectAddress: "1.2.3.5",
}, },
} }