mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Windows: Re-create custom NAT networks after restart if missing from HNS
Signed-off-by: Olli Janatuinen <olli.janatuinen@gmail.com>
This commit is contained in:
parent
2fbc30739b
commit
67c36d5d6e
1 changed files with 29 additions and 0 deletions
|
@ -264,6 +264,35 @@ func (daemon *Daemon) initNetworkController(activeSandboxes map[string]interface
|
||||||
}
|
}
|
||||||
|
|
||||||
if !found {
|
if !found {
|
||||||
|
// non-default nat networks should be re-created if missing from HNS
|
||||||
|
if v.Type() == "nat" && v.Name() != "nat" {
|
||||||
|
_, _, v4Conf, v6Conf := v.Info().IpamConfig()
|
||||||
|
netOption := map[string]string{}
|
||||||
|
for k, v := range v.Info().DriverOptions() {
|
||||||
|
if k != winlibnetwork.NetworkName && k != winlibnetwork.HNSID {
|
||||||
|
netOption[k] = v
|
||||||
|
}
|
||||||
|
}
|
||||||
|
name := v.Name()
|
||||||
|
id := v.ID()
|
||||||
|
|
||||||
|
err = v.Delete()
|
||||||
|
if err != nil {
|
||||||
|
logrus.Errorf("Error occurred when removing network %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err := daemon.netController.NewNetwork("nat", name, id,
|
||||||
|
libnetwork.NetworkOptionGeneric(options.Generic{
|
||||||
|
netlabel.GenericData: netOption,
|
||||||
|
}),
|
||||||
|
libnetwork.NetworkOptionIpam("default", "", v4Conf, v6Conf, nil),
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Errorf("Error occurred when creating network %v", err)
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
// global networks should not be deleted by local HNS
|
// global networks should not be deleted by local HNS
|
||||||
if v.Info().Scope() != datastore.GlobalScope {
|
if v.Info().Scope() != datastore.GlobalScope {
|
||||||
err = v.Delete()
|
err = v.Delete()
|
||||||
|
|
Loading…
Reference in a new issue