From 4e5efe56de39b5e75478056a95d1177792d4b907 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Wed, 4 Jan 2017 13:13:02 -0800 Subject: [PATCH 1/3] rename for clarity --- controllers/gce/controller/controller.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/gce/controller/controller.go b/controllers/gce/controller/controller.go index 9b69b1e6f..c4d15e2fd 100644 --- a/controllers/gce/controller/controller.go +++ b/controllers/gce/controller/controller.go @@ -290,11 +290,11 @@ func (lbc *LoadBalancerController) sync(key string) (err error) { } glog.V(3).Infof("Syncing %v", key) - paths, err := lbc.ingLister.List() + ingresses, err := lbc.ingLister.List() if err != nil { return err } - nodePorts := lbc.tr.toNodePorts(&paths) + nodePorts := lbc.tr.toNodePorts(&ingresses) lbNames := lbc.ingLister.Store.ListKeys() lbs, err := lbc.ListRuntimeInfo() if err != nil { From d1f13a3ad4dfae1e1ec5bbeb9615c1f710b6efc7 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Wed, 4 Jan 2017 13:13:25 -0800 Subject: [PATCH 2/3] Fix a typo in logs --- controllers/gce/firewalls/firewalls.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/gce/firewalls/firewalls.go b/controllers/gce/firewalls/firewalls.go index b448797bb..31bfdacf1 100644 --- a/controllers/gce/firewalls/firewalls.go +++ b/controllers/gce/firewalls/firewalls.go @@ -82,7 +82,7 @@ func (fr *FirewallRules) Sync(nodePorts []int64, nodeNames []string) error { // Shutdown shuts down this firewall rules manager. func (fr *FirewallRules) Shutdown() error { - glog.Infof("Deleting fireawll rule with suffix %v", fr.namer.FrSuffix()) + glog.Infof("Deleting firewall rule with suffix %v", fr.namer.FrSuffix()) return fr.cloud.DeleteFirewall(fr.namer.FrSuffix()) } From c3b7631b017462bb27a9eb10018913d534498b05 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Wed, 4 Jan 2017 13:14:08 -0800 Subject: [PATCH 3/3] Log node-sync details --- controllers/gce/instances/instances.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/controllers/gce/instances/instances.go b/controllers/gce/instances/instances.go index 1fa21cba5..c72eaf7ce 100644 --- a/controllers/gce/instances/instances.go +++ b/controllers/gce/instances/instances.go @@ -230,15 +230,15 @@ func (i *Instances) Sync(nodes []string) (err error) { removeNodes := gceNodes.Difference(kubeNodes).List() addNodes := kubeNodes.Difference(gceNodes).List() if len(removeNodes) != 0 { - if err = i.Remove( - igName, gceNodes.Difference(kubeNodes).List()); err != nil { + glog.V(4).Infof("Removing nodes from IG: %v", removeNodes) + if err = i.Remove(igName, removeNodes); err != nil { return err } } if len(addNodes) != 0 { - if err = i.Add( - igName, kubeNodes.Difference(gceNodes).List()); err != nil { + glog.V(4).Infof("Adding nodes to IG: %v", removeNodes) + if err = i.Add(igName, addNodes); err != nil { return err } }