Skip to content

Commit 9776047

Browse files
thaJeztahthaJeztah
committed
migrate to github.com/moby/sys/userns
Commit 8437c56 migrated the use of the userns package to the github.com/moby/sys/user module. After further discussion with maintainers, it was decided to move the userns package to a separate module, as it has no direct relation with "user" operations (other than having "user" in its name). This patch migrates our code to use the new module. Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 58cf6e2 commit 9776047

21 files changed

Lines changed: 226 additions & 19 deletions

File tree

‎cmd/containerd-shim-runc-v2/task/service.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"os"
2525
"sync"
2626

27-
"github.com/moby/sys/user/userns"
27+
"github.com/moby/sys/userns"
2828

2929
"github.com/containerd/cgroups/v3"
3030
"github.com/containerd/cgroups/v3/cgroup1"

‎core/diff/apply/apply_linux.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"os"
2424
"strings"
2525

26-
"github.com/moby/sys/user/userns"
26+
"github.com/moby/sys/userns"
2727
"golang.org/x/sys/unix"
2828

2929
"github.com/containerd/containerd/v2/core/mount"

‎core/mount/mount_linux.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"time"
3030

3131
"github.com/containerd/log"
32-
"github.com/moby/sys/user/userns"
32+
"github.com/moby/sys/userns"
3333
"golang.org/x/sys/unix"
3434
)
3535

‎go.mod‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ require (
4747
github.com/moby/sys/sequential v0.6.0
4848
github.com/moby/sys/signal v0.7.1
4949
github.com/moby/sys/symlink v0.3.0
50-
github.com/moby/sys/user v0.2.0
50+
github.com/moby/sys/user v0.3.0
51+
github.com/moby/sys/userns v0.1.0
5152
github.com/opencontainers/go-digest v1.0.0
5253
github.com/opencontainers/image-spec v1.1.0
5354
github.com/opencontainers/runtime-spec v1.2.0

‎go.sum‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,10 @@ github.com/moby/sys/signal v0.7.1 h1:PrQxdvxcGijdo6UXXo/lU/TvHUWyPhj7UOpSo8tuvk0
219219
github.com/moby/sys/signal v0.7.1/go.mod h1:Se1VGehYokAkrSQwL4tDzHvETwUZlnY7S5XtQ50mQp8=
220220
github.com/moby/sys/symlink v0.3.0 h1:GZX89mEZ9u53f97npBy4Rc3vJKj7JBDj/PN2I22GrNU=
221221
github.com/moby/sys/symlink v0.3.0/go.mod h1:3eNdhduHmYPcgsJtZXW1W4XUJdZGBIkttZ8xKqPUJq0=
222-
github.com/moby/sys/user v0.2.0 h1:OnpapJsRp25vkhw8TFG6OLJODNh/3rEwRWtJ3kakwRM=
223-
github.com/moby/sys/user v0.2.0/go.mod h1:RYstrcWOJpVh+6qzUqp2bU3eaRpdiQeKGlKitaH0PM8=
222+
github.com/moby/sys/user v0.3.0 h1:9ni5DlcW5an3SvRSx4MouotOygvzaXbaSrc/wGDFWPo=
223+
github.com/moby/sys/user v0.3.0/go.mod h1:bG+tYYYJgaMtRKgEmuueC0hJEAZWwtIbZTB+85uoHjs=
224+
github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g=
225+
github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28=
224226
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
225227
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
226228
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=

‎internal/cri/server/podsandbox/sandbox_run_linux.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"strings"
2424

2525
"github.com/containerd/containerd/v2/pkg/oci"
26-
"github.com/moby/sys/user/userns"
26+
"github.com/moby/sys/userns"
2727
imagespec "github.com/opencontainers/image-spec/specs-go/v1"
2828
runtimespec "github.com/opencontainers/runtime-spec/specs-go"
2929
"github.com/opencontainers/selinux/go-selinux"

‎internal/cri/server/podsandbox/sandbox_run_linux_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"strconv"
2323
"testing"
2424

25-
"github.com/moby/sys/user/userns"
25+
"github.com/moby/sys/userns"
2626
imagespec "github.com/opencontainers/image-spec/specs-go/v1"
2727
runtimespec "github.com/opencontainers/runtime-spec/specs-go"
2828
"github.com/opencontainers/selinux/go-selinux"

‎internal/cri/server/service_linux.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package server
1919
import (
2020
"fmt"
2121

22-
"github.com/moby/sys/user/userns"
22+
"github.com/moby/sys/userns"
2323
"github.com/opencontainers/selinux/go-selinux"
2424
"tags.cncf.io/container-device-interface/pkg/cdi"
2525

‎pkg/archive/tar.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"syscall"
3030
"time"
3131

32-
"github.com/moby/sys/user/userns"
32+
"github.com/moby/sys/userns"
3333

3434
"github.com/containerd/containerd/v2/pkg/archive/tarheader"
3535
"github.com/containerd/containerd/v2/pkg/epoch"

‎pkg/archive/tar_unix.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"strings"
2828
"syscall"
2929

30-
"github.com/moby/sys/user/userns"
30+
"github.com/moby/sys/userns"
3131
"golang.org/x/sys/unix"
3232

3333
"github.com/containerd/continuity/fs"

0 commit comments

Comments
 (0)