From f1b166f74fbaaf953fd026f5f80a1962f00439aa Mon Sep 17 00:00:00 2001 From: Derek Nola Date: Wed, 21 Jan 2026 10:14:10 -0800 Subject: [PATCH] Move to rootlesskit v2 (#13486) Signed-off-by: Derek Nola --- go.mod | 4 ++-- go.sum | 12 ++++++------ pkg/cli/cmds/init_linux.go | 2 +- pkg/rootless/portdriver.go | 6 +++--- pkg/rootless/rootless.go | 8 ++++---- pkg/rootlessports/controller.go | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index 9b1e38648e1..a24f3cc1f2e 100644 --- a/go.mod +++ b/go.mod @@ -135,7 +135,7 @@ require ( github.com/rancher/wharfie v0.7.0 github.com/rancher/wrangler/v3 v3.2.3 github.com/robfig/cron/v3 v3.0.1 - github.com/rootless-containers/rootlesskit v1.1.1 + github.com/rootless-containers/rootlesskit/v2 v2.3.6 github.com/sirupsen/logrus v1.9.3 github.com/spegel-org/spegel v0.6.0 github.com/spf13/pflag v1.0.10 @@ -285,7 +285,7 @@ require ( github.com/go-sql-driver/mysql v1.9.3 // indirect github.com/goccy/go-json v0.10.5 // indirect github.com/godbus/dbus/v5 v5.1.0 // indirect - github.com/gofrs/flock v0.8.1 // indirect + github.com/gofrs/flock v0.12.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v5 v5.2.2 // indirect github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect diff --git a/go.sum b/go.sum index 41dbaf2436c..39fb267cb63 100644 --- a/go.sum +++ b/go.sum @@ -564,8 +564,8 @@ github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw= github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA= github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw= -github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= +github.com/gofrs/flock v0.12.1 h1:MTLVXXHf8ekldpJk3AKicLij9MdwOWkZ+a/jHHZby9E= +github.com/gofrs/flock v0.12.1/go.mod h1:9zxTsyu5xtJ9DK+1tFZyibEV7y3uwDxPPfbxeeHCoD0= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8= @@ -1237,8 +1237,8 @@ github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99 github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= 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 v1.1.1 h1:F5psKWoWY9/VjZ3ifVcaosjvFZJOagX85U22M0/EQZE= -github.com/rootless-containers/rootlesskit v1.1.1/go.mod h1:UD5GoA3dqKCJrnvnhVgQQnweMF2qZnf9KLw8EewcMZI= +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/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU= github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -1843,8 +1843,8 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY= -gotest.tools/v3 v3.5.0/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= +gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q= +gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/pkg/cli/cmds/init_linux.go b/pkg/cli/cmds/init_linux.go index a33a4508f9c..88183bd6920 100644 --- a/pkg/cli/cmds/init_linux.go +++ b/pkg/cli/cmds/init_linux.go @@ -7,7 +7,7 @@ import ( "github.com/moby/sys/userns" pkgerrors "github.com/pkg/errors" - "github.com/rootless-containers/rootlesskit/pkg/parent/cgrouputil" + "github.com/rootless-containers/rootlesskit/v2/pkg/parent/cgrouputil" ) // EvacuateCgroup2 will handle evacuating the root cgroup in order to enable subtree_control, diff --git a/pkg/rootless/portdriver.go b/pkg/rootless/portdriver.go index 5c4d95b5f7e..e2956d2c063 100644 --- a/pkg/rootless/portdriver.go +++ b/pkg/rootless/portdriver.go @@ -7,9 +7,9 @@ import ( "path" "strings" - "github.com/rootless-containers/rootlesskit/pkg/port" - portbuiltin "github.com/rootless-containers/rootlesskit/pkg/port/builtin" - portslirp4netns "github.com/rootless-containers/rootlesskit/pkg/port/slirp4netns" + "github.com/rootless-containers/rootlesskit/v2/pkg/port" + portbuiltin "github.com/rootless-containers/rootlesskit/v2/pkg/port/builtin" + portslirp4netns "github.com/rootless-containers/rootlesskit/v2/pkg/port/slirp4netns" "github.com/sirupsen/logrus" ) diff --git a/pkg/rootless/rootless.go b/pkg/rootless/rootless.go index a59b3bda772..d0eda1d684a 100644 --- a/pkg/rootless/rootless.go +++ b/pkg/rootless/rootless.go @@ -14,10 +14,10 @@ import ( "github.com/opencontainers/cgroups" pkgerrors "github.com/pkg/errors" - "github.com/rootless-containers/rootlesskit/pkg/child" - "github.com/rootless-containers/rootlesskit/pkg/copyup/tmpfssymlink" - "github.com/rootless-containers/rootlesskit/pkg/network/slirp4netns" - "github.com/rootless-containers/rootlesskit/pkg/parent" + "github.com/rootless-containers/rootlesskit/v2/pkg/child" + "github.com/rootless-containers/rootlesskit/v2/pkg/copyup/tmpfssymlink" + "github.com/rootless-containers/rootlesskit/v2/pkg/network/slirp4netns" + "github.com/rootless-containers/rootlesskit/v2/pkg/parent" "github.com/sirupsen/logrus" "golang.org/x/sys/unix" ) diff --git a/pkg/rootlessports/controller.go b/pkg/rootlessports/controller.go index 784ae288d6d..74cedc587bc 100644 --- a/pkg/rootlessports/controller.go +++ b/pkg/rootlessports/controller.go @@ -9,8 +9,8 @@ import ( "github.com/k3s-io/k3s/pkg/rootless" corev1 "github.com/rancher/wrangler/v3/pkg/generated/controllers/core/v1" - "github.com/rootless-containers/rootlesskit/pkg/api/client" - "github.com/rootless-containers/rootlesskit/pkg/port" + "github.com/rootless-containers/rootlesskit/v2/pkg/api/client" + "github.com/rootless-containers/rootlesskit/v2/pkg/port" "github.com/sirupsen/logrus" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/labels"