Merge pull request #9976 from thaJeztah/internalize_cri_utils

pkg/systemd, pkg/seutil: move to internal/cri

internal/cri/server/helpers_linux.go

@@ -27,6 +27,7 @@ import (
 	"time"
 
 	"github.com/containerd/cgroups/v3"
+	"github.com/containerd/log"
 	"github.com/moby/sys/mountinfo"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"golang.org/x/sys/unix"
@@ -35,10 +36,9 @@ import (
 	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/core/mount"
 	"github.com/containerd/containerd/v2/core/snapshots"
+	"github.com/containerd/containerd/v2/internal/cri/seutil"
 	"github.com/containerd/containerd/v2/pkg/apparmor"
 	"github.com/containerd/containerd/v2/pkg/seccomp"
-	"github.com/containerd/containerd/v2/pkg/seutil"
-	"github.com/containerd/log"
 )
 
 // apparmorEnabled returns true if apparmor is enabled, supported by the host,

internal/cri/server/podsandbox/helpers_linux.go

@@ -28,18 +28,18 @@ import (
 	"syscall"
 	"time"
 
-	containerd "github.com/containerd/containerd/v2/client"
-	"github.com/containerd/containerd/v2/core/mount"
-	"github.com/containerd/containerd/v2/core/snapshots"
-	"github.com/containerd/containerd/v2/pkg/seccomp"
-	"github.com/containerd/containerd/v2/pkg/seutil"
 	"github.com/containerd/log"
-
 	"github.com/moby/sys/mountinfo"
 	runtimespec "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/opencontainers/selinux/go-selinux/label"
 	"golang.org/x/sys/unix"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
+
+	containerd "github.com/containerd/containerd/v2/client"
+	"github.com/containerd/containerd/v2/core/mount"
+	"github.com/containerd/containerd/v2/core/snapshots"
+	"github.com/containerd/containerd/v2/internal/cri/seutil"
+	"github.com/containerd/containerd/v2/pkg/seccomp"
 )
 
 const (

internal/cri/server/runtime_config_linux.go

@@ -22,7 +22,7 @@ import (
 
 	runcoptions "github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
 	criconfig "github.com/containerd/containerd/v2/internal/cri/config"
-	"github.com/containerd/containerd/v2/pkg/systemd"
+	"github.com/containerd/containerd/v2/internal/cri/systemd"
 	"github.com/containerd/log"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 )

internal/cri/server/runtime_config_linux_test.go

@@ -21,7 +21,7 @@ import (
 	"testing"
 
 	criconfig "github.com/containerd/containerd/v2/internal/cri/config"
-	"github.com/containerd/containerd/v2/pkg/systemd"
+	"github.com/containerd/containerd/v2/internal/cri/systemd"
 	"github.com/containerd/containerd/v2/plugins"
 	"github.com/stretchr/testify/assert"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"