Skip to content

Bug 1538389 - Allow node IP change to update Host IP in HostSubnet resource #18281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 30, 2018
Merged

Bug 1538389 - Allow node IP change to update Host IP in HostSubnet resource #18281

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bda768f
SDN master should not guess IP addr of the node.
Jan 25, 2018
31fcad5
Allow node IP change to update Host IP in HostSubnet resource
Jan 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 15 additions & 27 deletions pkg/network/master/subnets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ func (master *OsdnMaster) SubnetStartMaster(clusterNetworks []common.ClusterNetw
return nil
}

// addNode takes the nodeName, a preferred nodeIP, the node's annotations and other valid ip addresses
// addNode takes the nodeName, a preferred nodeIP and the node's annotations
// Creates or updates a HostSubnet if needed
// Returns the IP address used for hostsubnet (either the preferred or one from the otherValidAddresses) and any error
func (master *OsdnMaster) addNode(nodeName string, nodeIP string, hsAnnotations map[string]string, otherValidAddresses []kapi.NodeAddress) (string, error) {
func (master *OsdnMaster) addNode(nodeName string, nodeIP string, hsAnnotations map[string]string) (string, error) {
// Validate node IP before proceeding
if err := master.networkInfo.ValidateNodeIP(nodeIP); err != nil {
return "", err
Expand All @@ -74,8 +74,6 @@ func (master *OsdnMaster) addNode(nodeName string, nodeIP string, hsAnnotations
if err == nil {
if sub.HostIP == nodeIP {
return nodeIP, nil
} else if isValidNodeIP(otherValidAddresses, sub.HostIP) {
return sub.HostIP, nil
} else {
// Node IP changed, update old subnet
sub.HostIP = nodeIP
Expand Down Expand Up @@ -131,23 +129,6 @@ func (master *OsdnMaster) deleteNode(nodeName string) error {
return nil
}

func isValidNodeIP(validAddresses []kapi.NodeAddress, nodeIP string) bool {
for _, addr := range validAddresses {
if addr.Address == nodeIP {
return true
}
}
return false
}

func getNodeIP(node *kapi.Node) (string, error) {
if len(node.Status.Addresses) > 0 && node.Status.Addresses[0].Address != "" {
return node.Status.Addresses[0].Address, nil
} else {
return netutils.GetNodeIP(node.Name)
}
}

// Because openshift-sdn uses an overlay and doesn't need GCE Routes, we need to
// clear the NetworkUnavailable condition that kubelet adds to initial node
// status when using GCE.
Expand Down Expand Up @@ -210,20 +191,27 @@ func (master *OsdnMaster) watchNodes() {

func (master *OsdnMaster) handleAddOrUpdateNode(obj, _ interface{}, eventType watch.EventType) {
node := obj.(*kapi.Node)
nodeIP, err := getNodeIP(node)
if err != nil {
glog.Errorf("Failed to get node IP for node %s, skipping %s event, node: %v", node.Name, eventType, node)

var nodeIP string
for _, addr := range node.Status.Addresses {
if addr.Type == kapi.NodeInternalIP {
nodeIP = addr.Address
break
}
}
if len(nodeIP) == 0 {
glog.Errorf("Node IP is not set for node %s, skipping %s event, node: %v", node.Name, eventType, node)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This entire file needs to use utilruntime.HandleError. Any kube code that eats an error (that uses glog.Errorf) should be utilruntime.HandleError instead. That ensures that we get rate limiting, that errors are reported to sentry, and also that hotloop requests get processed.

Can be a follow up PR but please correct that before we ship 3.9

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Created follow up pr: #18343

return
}
master.clearInitialNodeNetworkUnavailableCondition(node)

if oldNodeIP, ok := master.hostSubnetNodeIPs[node.UID]; ok && ((nodeIP == oldNodeIP) || isValidNodeIP(node.Status.Addresses, oldNodeIP)) {
if oldNodeIP, ok := master.hostSubnetNodeIPs[node.UID]; ok && (nodeIP == oldNodeIP) {
return
}
// Node status is frequently updated by kubelet, so log only if the above condition is not met
glog.V(5).Infof("Watch %s event for Node %q", eventType, node.Name)

usedNodeIP, err := master.addNode(node.Name, nodeIP, nil, node.Status.Addresses)
usedNodeIP, err := master.addNode(node.Name, nodeIP, nil)
if err != nil {
glog.Errorf("Error creating subnet for node %s, ip %s: %v", node.Name, nodeIP, err)
return
Expand Down Expand Up @@ -280,7 +268,7 @@ func (master *OsdnMaster) handleAddOrUpdateSubnet(obj, _ interface{}, eventType
glog.Errorf("VNID %s is an invalid value for annotation %s. Annotation will be ignored.", vnid, networkapi.FixedVNIDHostAnnotation)
}
}
_, err = master.addNode(hs.Name, hs.HostIP, hsAnnotations, nil)
_, err = master.addNode(hs.Name, hs.HostIP, hsAnnotations)
if err != nil {
glog.Errorf("Error creating subnet for node %s, ip %s: %v", hs.Name, hs.HostIP, err)
return
Expand Down