From 48cfa9f758e57acc9489b89172ccf998a594b6b8 Mon Sep 17 00:00:00 2001 From: Chris Telfer Date: Mon, 5 Mar 2018 10:43:25 -0500 Subject: [PATCH] Delete the load balancer endpoint in Ingress nets Ingress networks will no longer automatically remove their load-balancing endpoint (and sandbox) automatically when the network is otherwise upopulated. This is to prevent automatic removal of the ingress networks when all the containers leave them. Therefore explicit removal of an ingress network also requires explicit removal of its load-balancing endpoint. Signed-off-by: Chris Telfer Upstream-commit: 3da4ebf355d3494d1403b2878a1ae6958b2724e9 Component: engine --- components/engine/daemon/network.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/engine/daemon/network.go b/components/engine/daemon/network.go index e5dcd06862..0f2e9c2526 100644 --- a/components/engine/daemon/network.go +++ b/components/engine/daemon/network.go @@ -222,6 +222,8 @@ func (daemon *Daemon) releaseIngress(id string) { return } + daemon.deleteLoadBalancerSandbox(n) + if err := n.Delete(); err != nil { logrus.Errorf("Failed to delete ingress network %s: %v", n.ID(), err) return