Skip to content

Commit 2615860

Browse files
committed
pkg/seutil: move to internal/cri
This pacakge is only used internally in the cri package, which is an internal packages, so we can make the utility internal as well. Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 33732bc commit 2615860

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

internal/cri/server/helpers_linux.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
"time"
2828

2929
"github.com/containerd/cgroups/v3"
30+
"github.com/containerd/log"
3031
"github.com/moby/sys/mountinfo"
3132
"github.com/opencontainers/runtime-spec/specs-go"
3233
"golang.org/x/sys/unix"
@@ -35,10 +36,9 @@ import (
3536
containerd "github.com/containerd/containerd/v2/client"
3637
"github.com/containerd/containerd/v2/core/mount"
3738
"github.com/containerd/containerd/v2/core/snapshots"
39+
"github.com/containerd/containerd/v2/internal/cri/seutil"
3840
"github.com/containerd/containerd/v2/pkg/apparmor"
3941
"github.com/containerd/containerd/v2/pkg/seccomp"
40-
"github.com/containerd/containerd/v2/pkg/seutil"
41-
"github.com/containerd/log"
4242
)
4343

4444
// apparmorEnabled returns true if apparmor is enabled, supported by the host,

internal/cri/server/podsandbox/helpers_linux.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@ import (
2828
"syscall"
2929
"time"
3030

31-
containerd "github.com/containerd/containerd/v2/client"
32-
"github.com/containerd/containerd/v2/core/mount"
33-
"github.com/containerd/containerd/v2/core/snapshots"
34-
"github.com/containerd/containerd/v2/pkg/seccomp"
35-
"github.com/containerd/containerd/v2/pkg/seutil"
3631
"github.com/containerd/log"
37-
3832
"github.com/moby/sys/mountinfo"
3933
runtimespec "github.com/opencontainers/runtime-spec/specs-go"
4034
"github.com/opencontainers/selinux/go-selinux/label"
4135
"golang.org/x/sys/unix"
4236
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
37+
38+
containerd "github.com/containerd/containerd/v2/client"
39+
"github.com/containerd/containerd/v2/core/mount"
40+
"github.com/containerd/containerd/v2/core/snapshots"
41+
"github.com/containerd/containerd/v2/internal/cri/seutil"
42+
"github.com/containerd/containerd/v2/pkg/seccomp"
4343
)
4444

4545
const (
File renamed without changes.

0 commit comments

Comments
 (0)