Merge pull request #118 from thockin/nits

Cleanups
kubernetes · Jan 10, 2017 · 6f5a8ce · 6f5a8ce
2 parents e58f510 + c3b7631
commit 6f5a8ce
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git 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 {

diff --git 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())
 }
 

diff --git 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
 			}
 		}