Fix merge problem

robmry · robmry · commit 333cfa640239 · 2024-09-17T10:38:09.000+01:00
Commit f9c0103 (WSL2 mirrored-mode loopback) uses netlink funcs that were removed/wrapped by commit 00bf437. Signed-off-by: Rob Murray <rob.murray@docker.com>
diff --git a/libnetwork/drivers/bridge/setup_ip_tables_linux.go b/libnetwork/drivers/bridge/setup_ip_tables_linux.go
@@ -13,6 +13,7 @@ import (
 	"github.com/docker/docker/internal/nlwrap"
 	"github.com/docker/docker/libnetwork/iptables"
 	"github.com/docker/docker/libnetwork/types"
+	"github.com/vishvananda/netlink"
 )
 
 // DockerChain: DOCKER iptable chain name
@@ -569,7 +570,7 @@ func insertMirroredWSL2Rule(config configuration) bool {
 	if !config.EnableUserlandProxy || config.UserlandProxyPath == "" {
 		return false
 	}
-	if _, err := netlink.LinkByName("loopback0"); err != nil {
+	if _, err := nlwrap.LinkByName("loopback0"); err != nil {
 		if !errors.As(err, &netlink.LinkNotFoundError{}) {
 			log.G(context.TODO()).WithError(err).Warn("Failed to check for WSL interface")
 		}
diff --git a/libnetwork/drivers/bridge/setup_ip_tables_linux_test.go b/libnetwork/drivers/bridge/setup_ip_tables_linux_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/docker/docker/libnetwork/driverapi"
 	"github.com/docker/docker/libnetwork/iptables"
 	"github.com/docker/docker/libnetwork/netlabel"
+	"github.com/vishvananda/netlink"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"
 )

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ import (`
`13`	`13`	`"github.com/docker/docker/internal/nlwrap"`
`14`	`14`	`"github.com/docker/docker/libnetwork/iptables"`
`15`	`15`	`"github.com/docker/docker/libnetwork/types"`
	`16`	`+ "github.com/vishvananda/netlink"`
`16`	`17`	`)`
`17`	`18`
`18`	`19`	`// DockerChain: DOCKER iptable chain name`
`@@ -569,7 +570,7 @@ func insertMirroredWSL2Rule(config configuration) bool {`
`569`	`570`	`if !config.EnableUserlandProxy \|\| config.UserlandProxyPath == "" {`
`570`	`571`	`return false`
`571`	`572`	`}`
`572`		`- if _, err := netlink.LinkByName("loopback0"); err != nil {`
	`573`	`+ if _, err := nlwrap.LinkByName("loopback0"); err != nil {`
`573`	`574`	`if !errors.As(err, &netlink.LinkNotFoundError{}) {`
`574`	`575`	`log.G(context.TODO()).WithError(err).Warn("Failed to check for WSL interface")`
`575`	`576`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ import (`
`11`	`11`	`"github.com/docker/docker/libnetwork/driverapi"`
`12`	`12`	`"github.com/docker/docker/libnetwork/iptables"`
`13`	`13`	`"github.com/docker/docker/libnetwork/netlabel"`
	`14`	`+ "github.com/vishvananda/netlink"`
`14`	`15`	`"gotest.tools/v3/assert"`
`15`	`16`	`is "gotest.tools/v3/assert/cmp"`
`16`	`17`	`)`