0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1400 from mrjana/lb

Browse source 
Cleanup ingress network and sandbox on leave
This commit is contained in:
Santhosh Manohar 2016-08-18 09:49:47 -07:00 • committed by GitHub
commit bbe19ab902
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libnetwork/controller.go
View file

@ -308,6 +308,24 @@ func (c *controller) clusterAgentInit() {
c.clusterConfigAvailable = false
c.agentInitDone = make(chan struct{})
c.Unlock()
if err := c.ingressSandbox.Delete(); err != nil {
log.Warnf("Could not delete ingress sandbox while leaving: %v", err)
}
c.ingressSandbox = nil
n, err := c.NetworkByName("ingress")
if err != nil {
log.Warnf("Could not find ingress network while leaving: %v", err)
}
if n != nil {
if err := n.Delete(); err != nil {
log.Warnf("Could not delete ingress network while leaving: %v", err)
}
}
c.agentClose()
return
}