Skip to content

Treat initial and subsequent resync events identically for node ip #486

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 1 commit into from
Aug 4, 2017
Merged

Treat initial and subsequent resync events identically for node ip #486

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
35 changes: 21 additions & 14 deletions lib/backend/k8s/syncer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,14 +794,15 @@ func (syn *kubeSyncer) performSnapshot(versions *resourceVersions) (map[string][

versions.nodeVersion = noList.ListMeta.ResourceVersion
for _, no := range noList.Items {
node, err := resources.K8sNodeToCalico(&no)
if err != nil {
log.WithError(err).Fatal("Error converting node")
}
if node != nil {
snap[KEY_NO] = append(snap[KEY_NO], *node)
keys[KEY_NO][node.Key.String()] = true
}
kvpHostIP, kvpIPIPAddr := splitNodeEvent(&no)
log.WithFields(log.Fields{
"kvpHostIP": kvpHostIP,
"kvpIPIPAddr": kvpIPIPAddr,
}).Debug("Got node KVs.")
snap[KEY_NO] = append(snap[KEY_NO], *kvpHostIP)
keys[KEY_NO][kvpHostIP.Key.String()] = true
snap[KEY_HC] = append(snap[KEY_HC], *kvpIPIPAddr)
keys[KEY_HC][kvpIPIPAddr.Key.String()] = true
}
}

Expand Down Expand Up @@ -884,12 +885,7 @@ func (syn *kubeSyncer) parseNamespaceEvent(e watch.Event) []model.KVPair {
return []model.KVPair{*rules, *tags, *labels}
}

func (syn *kubeSyncer) parseNodeEvent(e watch.Event) (*model.KVPair, *model.KVPair) {
node, ok := e.Object.(*k8sapi.Node)
if !ok {
log.Panicf("Invalid node event. Type: %s, Object: %+v", e.Type, e.Object)
}

func splitNodeEvent(node *k8sapi.Node) (*model.KVPair, *model.KVPair) {
Copy link
Member

Choose a reason for hiding this comment

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

minor naming nit: I'd just call this splitNode since it's not actually taking an Event struct as an input, rather a Node.

kvp, err := resources.K8sNodeToCalico(node)
if err != nil {
log.WithError(err).Panic("Failed to convert k8s node to Calico node.")
Expand Down Expand Up @@ -922,6 +918,17 @@ func (syn *kubeSyncer) parseNodeEvent(e watch.Event) (*model.KVPair, *model.KVPa
}
kvpIPIPAddr.Revision = kvp.Revision

return kvpHostIp, kvpIPIPAddr
}

func (syn *kubeSyncer) parseNodeEvent(e watch.Event) (*model.KVPair, *model.KVPair) {
node, ok := e.Object.(*k8sapi.Node)
if !ok {
log.Panicf("Invalid node event. Type: %s, Object: %+v", e.Type, e.Object)
}

kvpHostIp, kvpIPIPAddr := splitNodeEvent(node)

if e.Type == watch.Deleted {
kvpHostIp.Value = nil
kvpIPIPAddr.Value = nil
Expand Down