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

Move IG GC out of backend pool and into cluster manager

Browse source
This commit is contained in:
bprashanth 2017-01-09 07:53:44 -08:00
parent 9d85c9b163
commit a6b0405480
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
controllers/gce/backends/backends.go
View file

@ -273,12 +273,6 @@ func (b *Backends) GC(svcNodePorts []int64) error {
return err return err
} }
} }
if len(svcNodePorts) == 0 {
glog.Infof("Deleting instance group %v", b.namer.IGName())
if err := b.nodePool.DeleteInstanceGroup(b.namer.IGName()); err != nil {
return err
}
}
return nil return nil
} }

13
controllers/gce/controller/cluster_manager.go
View file

@ -151,7 +151,7 @@ func (c *ClusterManager) Checkpoint(lbs []*loadbalancers.L7RuntimeInfo, nodeName
// DefaultBackend is managed in l7 pool, which doesn't understand instances, // DefaultBackend is managed in l7 pool, which doesn't understand instances,
// which the firewall rule requires. // which the firewall rule requires.
fwNodePorts := nodePorts fwNodePorts := nodePorts
if len(fwNodePorts) != 0 { if len(lbs) != 0 {
// If there are no Ingresses, we shouldn't be allowing traffic to the // If there are no Ingresses, we shouldn't be allowing traffic to the
// default backend. Equally importantly if the cluster gets torn down // default backend. Equally importantly if the cluster gets torn down
// we shouldn't leak the firewall rule. // we shouldn't leak the firewall rule.
@ -191,6 +191,17 @@ func (c *ClusterManager) GC(lbNames []string, nodePorts []int64) error {
if beErr != nil { if beErr != nil {
return beErr return beErr
} }
// TODO(ingress#120): Move this to the backend pool so it mirrors creation
var igErr error
if len(lbNames) == 0 {
igName := c.ClusterNamer.IGName()
glog.Infof("Deleting instance group %v", igName)
igErr = c.instancePool.DeleteInstanceGroup(igName)
}
if igErr != nil {
return igErr
}
return nil return nil
} }