From 33732bc13e3015270e67dd577fb88c4608cb9388 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 20 Mar 2024 11:05:25 +0100 Subject: [PATCH 1/2] pkg/systemd: 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 --- internal/cri/server/runtime_config_linux.go | 2 +- internal/cri/server/runtime_config_linux_test.go | 2 +- {pkg => internal/cri}/systemd/util.go | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename {pkg => internal/cri}/systemd/util.go (100%) diff --git a/internal/cri/server/runtime_config_linux.go b/internal/cri/server/runtime_config_linux.go index f2cce470c..c77f12bd8 100644 --- a/internal/cri/server/runtime_config_linux.go +++ b/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" ) diff --git a/internal/cri/server/runtime_config_linux_test.go b/internal/cri/server/runtime_config_linux_test.go index e42547974..027fc6814 100644 --- a/internal/cri/server/runtime_config_linux_test.go +++ b/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" diff --git a/pkg/systemd/util.go b/internal/cri/systemd/util.go similarity index 100% rename from pkg/systemd/util.go rename to internal/cri/systemd/util.go From 26158609b5797ce6bcbf2385dffd5b5eb45d3156 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 20 Mar 2024 11:11:24 +0100 Subject: [PATCH 2/2] 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 --- internal/cri/server/helpers_linux.go | 4 ++-- internal/cri/server/podsandbox/helpers_linux.go | 12 ++++++------ {pkg => internal/cri}/seutil/seutil.go | 0 3 files changed, 8 insertions(+), 8 deletions(-) rename {pkg => internal/cri}/seutil/seutil.go (100%) diff --git a/internal/cri/server/helpers_linux.go b/internal/cri/server/helpers_linux.go index 6ef2e6dc6..383bbc30a 100644 --- a/internal/cri/server/helpers_linux.go +++ b/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, diff --git a/internal/cri/server/podsandbox/helpers_linux.go b/internal/cri/server/podsandbox/helpers_linux.go index 1a2c26fe5..2d9ea718a 100644 --- a/internal/cri/server/podsandbox/helpers_linux.go +++ b/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 ( diff --git a/pkg/seutil/seutil.go b/internal/cri/seutil/seutil.go similarity index 100% rename from pkg/seutil/seutil.go rename to internal/cri/seutil/seutil.go