DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #118 from thockin/nits

Browse source 
Cleanups
This commit is contained in:
Prashanth B 2017-01-09 20:13:44 -08:00 committed by GitHub
commit 6f5a8ce4a6
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
controllers/gce/controller/controller.go
View file

@ -290,11 +290,11 @@ func (lbc *LoadBalancerController) sync(key string) (err error) {
} }
glog.V(3).Infof("Syncing %v", key) glog.V(3).Infof("Syncing %v", key)
paths, err := lbc.ingLister.List() ingresses, err := lbc.ingLister.List()
if err != nil { if err != nil {
return err return err
} }
nodePorts := lbc.tr.toNodePorts(&paths) nodePorts := lbc.tr.toNodePorts(&ingresses)
lbNames := lbc.ingLister.Store.ListKeys() lbNames := lbc.ingLister.Store.ListKeys()
lbs, err := lbc.ListRuntimeInfo() lbs, err := lbc.ListRuntimeInfo()
if err != nil { if err != nil {

2
controllers/gce/firewalls/firewalls.go
View file

@ -82,7 +82,7 @@ func (fr *FirewallRules) Sync(nodePorts []int64, nodeNames []string) error {
// Shutdown shuts down this firewall rules manager. // Shutdown shuts down this firewall rules manager.
func (fr *FirewallRules) Shutdown() error { 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()) return fr.cloud.DeleteFirewall(fr.namer.FrSuffix())
} }

8
controllers/gce/instances/instances.go
View file

@ -230,15 +230,15 @@ func (i *Instances) Sync(nodes []string) (err error) {
removeNodes := gceNodes.Difference(kubeNodes).List() removeNodes := gceNodes.Difference(kubeNodes).List()
addNodes := kubeNodes.Difference(gceNodes).List() addNodes := kubeNodes.Difference(gceNodes).List()
if len(removeNodes) != 0 { if len(removeNodes) != 0 {
if err = i.Remove( glog.V(4).Infof("Removing nodes from IG: %v", removeNodes)
igName, gceNodes.Difference(kubeNodes).List()); err != nil { if err = i.Remove(igName, removeNodes); err != nil {
return err return err
} }
} }
if len(addNodes) != 0 { if len(addNodes) != 0 {
if err = i.Add( glog.V(4).Infof("Adding nodes to IG: %v", removeNodes)
igName, kubeNodes.Difference(gceNodes).List()); err != nil { if err = i.Add(igName, addNodes); err != nil {
return err return err
} }
} }