runconfig: deprecate SetDefaultNetModeIfBlank

thaJeztah · thaJeztah · commit afdfe4ff86fa · 2024-06-17T00:26:46.000+02:00
Remove uses of this function and mark it deprecated. There's no known
consumers of this function, but let's stay on the safe side, and mark
it deprected for 1 release.

Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/daemon/container.go b/daemon/container.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/containerd/log"
 	containertypes "github.com/docker/docker/api/types/container"
+	networktypes "github.com/docker/docker/api/types/network"
 	"github.com/docker/docker/api/types/strslice"
 	"github.com/docker/docker/container"
 	"github.com/docker/docker/daemon/config"
@@ -19,7 +20,6 @@ import (
 	"github.com/docker/docker/oci/caps"
 	"github.com/docker/docker/opts"
 	"github.com/docker/docker/pkg/system"
-	"github.com/docker/docker/runconfig"
 	volumemounts "github.com/docker/docker/volume/mounts"
 	"github.com/docker/go-connections/nat"
 	"github.com/moby/sys/signal"
@@ -218,7 +218,9 @@ func (daemon *Daemon) setHostConfig(container *container.Container, hostConfig *
 		return err
 	}
 
-	runconfig.SetDefaultNetModeIfBlank(hostConfig)
+	if hostConfig != nil && hostConfig.NetworkMode == "" {
+		hostConfig.NetworkMode = networktypes.NetworkDefault
+	}
 	container.HostConfig = hostConfig
 	return nil
 }
diff --git a/daemon/create.go b/daemon/create.go
@@ -231,7 +231,9 @@ func (daemon *Daemon) create(ctx context.Context, daemonCfg *config.Config, opts
 	}
 	// Make sure NetworkMode has an acceptable value. We do this to ensure
 	// backwards API compatibility.
-	runconfig.SetDefaultNetModeIfBlank(ctr.HostConfig)
+	if ctr.HostConfig != nil && ctr.HostConfig.NetworkMode == "" {
+		ctr.HostConfig.NetworkMode = networktypes.NetworkDefault
+	}
 
 	daemon.updateContainerNetworkSettings(ctr, endpointsConfigs)
 	if err := daemon.Register(ctr); err != nil {
diff --git a/runconfig/hostconfig.go b/runconfig/hostconfig.go
@@ -11,6 +11,8 @@ import (
 // to default if it is not populated. This ensures backwards compatibility after
 // the validation of the network mode was moved from the docker CLI to the
 // docker daemon.
+//
+// Deprecated: SetDefaultNetModeIfBlank is no longer used abnd will be removed in the next release.
 func SetDefaultNetModeIfBlank(hc *container.HostConfig) {
 	if hc != nil && hc.NetworkMode == "" {
 		hc.NetworkMode = network.NetworkDefault
