Skip to content
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

fix for bz1400609 #12107

Merged
merged 1 commit into from
Dec 14, 2016
Merged

fix for bz1400609 #12107

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion pkg/sdn/plugin/subnets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,15 @@ func (master *OsdnMaster) deleteNode(nodeName string) error {
return nil
}

func isValidNodeIP(node *kapi.Node, nodeIP string) bool {
for _, addr := range node.Status.Addresses {
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
Expand Down Expand Up @@ -169,7 +178,7 @@ func (master *OsdnMaster) watchNodes() {
case cache.Sync, cache.Added, cache.Updated:
master.clearInitialNodeNetworkUnavailableCondition(node)

if oldNodeIP, ok := nodeAddressMap[uid]; ok && (oldNodeIP == nodeIP) {
if oldNodeIP, ok := nodeAddressMap[uid]; ok && ((nodeIP == oldNodeIP) || isValidNodeIP(node, oldNodeIP)) {
break
}
// Node status is frequently updated by kubelet, so log only if the above condition is not met
Expand Down