github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-09 13:12:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5116 from justinsb/skip_duplicate_node_address

Browse Source 
Don't allow duplicate values in NodeAddresses
This commit is contained in:
Daniel Smith
2015-03-09 11:59:54 -07:00
parent 42ff28c1a2 bf031fb082
commit 2a7be5619a
4 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/cloudprovider/controller/nodecontroller.go
View File

@@ -278,7 +278,7 @@ func (s *NodeController) PopulateAddresses(nodes *api.NodeList) (*api.NodeList,
glog.Errorf("error getting instance ip address for %s: %v", node.Name, err)
} else {
address := api.NodeAddress{Type: api.NodeLegacyHostIP, Address: hostIP.String()}
node.Status.Addresses = append(node.Status.Addresses, address)
api.AddToNodeAddresses(&node.Status.Addresses, address)
}
}
} else {
@@ -287,7 +287,7 @@ func (s *NodeController) PopulateAddresses(nodes *api.NodeList) (*api.NodeList,
addr := net.ParseIP(node.Name)
if addr != nil {
address := api.NodeAddress{Type: api.NodeLegacyHostIP, Address: addr.String()}
node.Status.Addresses = append(node.Status.Addresses, address)
api.AddToNodeAddresses(&node.Status.Addresses, address)
} else {
addrs, err := lookupIP(node.Name)
if err != nil {
@@ -296,7 +296,7 @@ func (s *NodeController) PopulateAddresses(nodes *api.NodeList) (*api.NodeList,
glog.Errorf("No ip address for node %v", node.Name)
} else {
address := api.NodeAddress{Type: api.NodeLegacyHostIP, Address: addrs[0].String()}
node.Status.Addresses = append(node.Status.Addresses, address)
api.AddToNodeAddresses(&node.Status.Addresses, address)
}
}
}