From 242fedd184cd91e1535bc55bc027d33991aa72a0 Mon Sep 17 00:00:00 2001 From: akolomentsev Date: Tue, 15 Jan 2019 17:05:23 -0800 Subject: [PATCH] keep old network ids for windows all networks are re-populated in the store during network controller initialization. In current version it also regenerate network Ids which may be referenced by other components and it may cause broken references to a networks. This commit avoids regeneration of network ids. Signed-off-by: Andrey Kolomentsev (cherry picked from commit e017717d96540dd263d95f90fdb2457928909924) Signed-off-by: Sebastiaan van Stijn Upstream-commit: 317e0acc4e602f978e4d9c0130a113d179026c8e Component: engine --- components/engine/daemon/daemon_windows.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/components/engine/daemon/daemon_windows.go b/components/engine/daemon/daemon_windows.go index e534d7eccc..4be55b7b87 100644 --- a/components/engine/daemon/daemon_windows.go +++ b/components/engine/daemon/daemon_windows.go @@ -343,8 +343,10 @@ func (daemon *Daemon) initNetworkController(config *config.Config, activeSandbox controller.WalkNetworks(s) drvOptions := make(map[string]string) - + nid := "" if n != nil { + nid = n.ID() + // global networks should not be deleted by local HNS if n.Info().Scope() == datastore.GlobalScope { continue @@ -389,7 +391,7 @@ func (daemon *Daemon) initNetworkController(config *config.Config, activeSandbox } v6Conf := []*libnetwork.IpamConf{} - _, err := controller.NewNetwork(strings.ToLower(v.Type), name, "", + _, err := controller.NewNetwork(strings.ToLower(v.Type), name, nid, libnetwork.NetworkOptionGeneric(options.Generic{ netlabel.GenericData: netOption, }),