diff --git a/api/server/router/container/container_routes.go b/api/server/router/container/container_routes.go index 731bbe4805..3872028652 100644 --- a/api/server/router/container/container_routes.go +++ b/api/server/router/container/container_routes.go @@ -658,7 +658,7 @@ func handleMACAddressBC(config *container.Config, hostConfig *container.HostConf } return "", nil } - if !hostConfig.NetworkMode.IsDefault() && !hostConfig.NetworkMode.IsBridge() && !hostConfig.NetworkMode.IsUserDefined() { + if !hostConfig.NetworkMode.IsBridge() && !hostConfig.NetworkMode.IsUserDefined() { return "", runconfig.ErrConflictContainerNetworkAndMac } @@ -687,7 +687,7 @@ func handleMACAddressBC(config *container.Config, hostConfig *container.HostConf return "", nil } var warning string - if hostConfig.NetworkMode.IsDefault() || hostConfig.NetworkMode.IsBridge() || hostConfig.NetworkMode.IsUserDefined() { + if hostConfig.NetworkMode.IsBridge() || hostConfig.NetworkMode.IsUserDefined() { nwName := hostConfig.NetworkMode.NetworkName() // If there's no endpoint config, create a place to store the configured address. if len(networkingConfig.EndpointsConfig) == 0 { diff --git a/daemon/container_operations.go b/daemon/container_operations.go index 78b1c98a19..48235ddd7d 100644 --- a/daemon/container_operations.go +++ b/daemon/container_operations.go @@ -420,9 +420,6 @@ func (daemon *Daemon) updateContainerNetworkSettings(container *container.Contai } networkName := mode.NetworkName() - if mode.IsDefault() { - networkName = daemon.netController.Config().DefaultNetwork - } if mode.IsUserDefined() { var err error @@ -461,15 +458,6 @@ func (daemon *Daemon) updateContainerNetworkSettings(container *container.Contai } } - // Convert any settings added by client in default name to - // engine's default network name key - if mode.IsDefault() { - if nConf, ok := container.NetworkSettings.Networks[mode.NetworkName()]; ok { - container.NetworkSettings.Networks[networkName] = nConf - delete(container.NetworkSettings.Networks, mode.NetworkName()) - } - } - if !mode.IsUserDefined() { return } diff --git a/daemon/inspect.go b/daemon/inspect.go index 62c7896ac3..c4324f1708 100644 --- a/daemon/inspect.go +++ b/daemon/inspect.go @@ -130,12 +130,8 @@ func (daemon *Daemon) getInspectData(daemonCfg *config.Config, container *contai // unconditionally, to keep backward compatibility with clients that use // unversioned API endpoints. if container.Config != nil && container.Config.MacAddress == "" { //nolint:staticcheck // ignore SA1019: field is deprecated, but still used on API < v1.44. - if nwm := hostConfig.NetworkMode; nwm.IsDefault() || nwm.IsBridge() || nwm.IsUserDefined() { - name := nwm.NetworkName() - if nwm.IsDefault() { - name = daemon.netController.Config().DefaultNetwork - } - if epConf, ok := container.NetworkSettings.Networks[name]; ok { + if nwm := hostConfig.NetworkMode; nwm.IsBridge() || nwm.IsUserDefined() { + if epConf, ok := container.NetworkSettings.Networks[nwm.NetworkName()]; ok { container.Config.MacAddress = epConf.DesiredMacAddress //nolint:staticcheck // ignore SA1019: field is deprecated, but still used on API < v1.44. } }