Merge pull request moby#2176 from ctelfer/remove-net-attach-info

Remove non-service cluster info on sbLeave
thaJeztah · May 31, 2018 · 3931ba4 · 3931ba4
2 parents 9ba7c0d + d8910dc
commit 3931ba4
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/endpoint.go b/endpoint.go
@@ -752,10 +752,8 @@ func (ep *endpoint) sbLeave(sb *sandbox, force bool, options ...EndpointOption)
 		}
 	}
 
-	if ep.svcID != "" {
-		if err := ep.deleteServiceInfoFromCluster(sb, true, "sbLeave"); err != nil {
-			logrus.Warnf("Failed to clean up service info on container %s disconnect: %v", ep.name, err)
-		}
+	if err := ep.deleteServiceInfoFromCluster(sb, true, "sbLeave"); err != nil {
+		logrus.Warnf("Failed to clean up service info on container %s disconnect: %v", ep.name, err)
 	}
 
 	if err := sb.clearNetworkResources(ep); err != nil {