Merge pull request #52456 from AkihiroSuda/rootlesskit-v3-mod

go.mod: github.com/rootless-containers/rootlesskit/v3 v3.0.0

daemon/info_unix.go

@@ -19,7 +19,7 @@ import (
 	"github.com/moby/moby/v2/daemon/internal/rootless"
 	"github.com/moby/moby/v2/pkg/sysinfo"
 	"github.com/pkg/errors"
-	rkclient "github.com/rootless-containers/rootlesskit/v2/pkg/api/client"
+	rkclient "github.com/rootless-containers/rootlesskit/v3/pkg/api/client"
 )
 
 // fillPlatformInfo fills the platform related info.

daemon/libnetwork/internal/rlkclient/rootlesskit_client_linux.go

@@ -16,8 +16,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/rootless-containers/rootlesskit/v2/pkg/api/client"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/port"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/api/client"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/port"
 )
 
 type PortDriverClient struct {

go.mod

@@ -86,7 +86,7 @@ require (
 	github.com/pelletier/go-toml/v2 v2.3.0
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.23.2
-	github.com/rootless-containers/rootlesskit/v2 v2.3.6
+	github.com/rootless-containers/rootlesskit/v3 v3.0.0
 	github.com/sirupsen/logrus v1.9.4
 	github.com/spf13/cobra v1.10.2
 	github.com/spf13/pflag v1.0.10

go.sum

@@ -690,8 +690,8 @@ github.com/prometheus/procfs v0.17.0 h1:FuLQ+05u4ZI+SS/w9+BWEM2TXiHKsUQ9TADiRH7D
 github.com/prometheus/procfs v0.17.0/go.mod h1:oPQLaDAMRbA+u8H5Pbfq+dl3VDAvHxMUOVhe0wYB2zw=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
 github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
-github.com/rootless-containers/rootlesskit/v2 v2.3.6 h1:m/26nAx0DbHZYaM46+uoQjfpu9G77QLzWj2jz25chO8=
-github.com/rootless-containers/rootlesskit/v2 v2.3.6/go.mod h1:pv+RESmjRmeUIOsEWOT1f8560CrdaQrDW0YsF4K5kAY=
+github.com/rootless-containers/rootlesskit/v3 v3.0.0 h1:esRHLVDYPWcqiPBTDR8gYeJB0kxVturOFYUP7kT2HgA=
+github.com/rootless-containers/rootlesskit/v3 v3.0.0/go.mod h1:cAJ5ACtY9npaRpdeT6x1sJgt4gAbYB3/At7qX2LwpII=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=
 github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=

vendor/github.com/rootless-containers/rootlesskit/v3/pkg/api/client/client.go

@@ -7,9 +7,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/rootless-containers/rootlesskit/v2/pkg/api"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/httputil"
-	"github.com/rootless-containers/rootlesskit/v2/pkg/port"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/api"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/httputil"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/port"
 )
 
 type Client interface {

vendor/github.com/rootless-containers/rootlesskit/v3/pkg/port/port.go

@@ -3,8 +3,9 @@ package port
 import (
 	"context"
 	"net"
+	"net/http"
 
-	"github.com/rootless-containers/rootlesskit/v2/pkg/api"
+	"github.com/rootless-containers/rootlesskit/v3/pkg/api"
 )
 
 type Spec struct {
@@ -18,6 +19,7 @@ type Spec struct {
 	// Default values:
 	// - builtin     driver: 127.0.0.1
 	// - slirp4netns driver: slirp4netns's child IP, e.g., 10.0.2.100
+	// - gvisor-tap-vsock driver: gvisor-tap-vsock's child IP, e.g., 10.0.2.100
 	ChildIP string `json:"childIP,omitempty"`
 }
 
@@ -33,10 +35,21 @@ type Manager interface {
 	RemovePort(ctx context.Context, id int) error
 }
 
+// VirtualNetworkProvider is a minimal interface exposed by network drivers
+// that provide an in-process virtual network implementation usable by port drivers.
+// For drivers that do not expose such a network object, this can be nil.
+type VirtualNetworkProvider interface {
+	Mux() *http.ServeMux
+}
+
 // ChildContext is used for RunParentDriver
 type ChildContext struct {
 	// IP of the tap device
 	IP net.IP
+	// Network is the virtual network object from the network driver
+	Network VirtualNetworkProvider
+	// GatewayIP is the gateway IP address of the virtual network (e.g., 10.0.2.2)
+	GatewayIP net.IP
 }
 
 // ParentDriver is a driver for the parent process.

vendor/modules.txt

@@ -1412,12 +1412,12 @@ github.com/prometheus/common/model
 github.com/prometheus/procfs
 github.com/prometheus/procfs/internal/fs
 github.com/prometheus/procfs/internal/util
-# github.com/rootless-containers/rootlesskit/v2 v2.3.6
-## explicit; go 1.24.2
-github.com/rootless-containers/rootlesskit/v2/pkg/api
-github.com/rootless-containers/rootlesskit/v2/pkg/api/client
-github.com/rootless-containers/rootlesskit/v2/pkg/httputil
-github.com/rootless-containers/rootlesskit/v2/pkg/port
+# github.com/rootless-containers/rootlesskit/v3 v3.0.0
+## explicit; go 1.25.0
+github.com/rootless-containers/rootlesskit/v3/pkg/api
+github.com/rootless-containers/rootlesskit/v3/pkg/api/client
+github.com/rootless-containers/rootlesskit/v3/pkg/httputil
+github.com/rootless-containers/rootlesskit/v3/pkg/port
 # github.com/sasha-s/go-deadlock v0.3.5
 ## explicit
 github.com/sasha-s/go-deadlock