scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Node-ip is not used when cloud provider is used

Browse Source 
This fixes #23568
This commit is contained in:
Steve Leon
2016-09-20 13:49:16 -07:00
parent 30ff1f495a
commit 6efa1172f5
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/kubelet/kubelet_node_status.go
View File

@@ -372,6 +372,19 @@ func (kl *Kubelet) setNodeAddress(node *api.Node) error {
if err != nil { if err != nil {
return fmt.Errorf("failed to get node address from cloud provider: %v", err) return fmt.Errorf("failed to get node address from cloud provider: %v", err)
} }
if kl.nodeIP != nil {
for _, nodeAddress := range nodeAddresses {
if nodeAddress.Address == kl.nodeIP.String() {
node.Status.Addresses = []api.NodeAddress{
{Type: nodeAddress.Type, Address: nodeAddress.Address},
}
return nil
}
}
return fmt.Errorf("failed to get node address from cloud provider that matches ip: %v", kl.nodeIP)
}
node.Status.Addresses = nodeAddresses node.Status.Addresses = nodeAddresses
} else { } else {
var ipAddr net.IP var ipAddr net.IP