From eb8981f3520a0d6e48cc8d29a025a17c46a5d0d2 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 24 Jan 2024 18:07:20 +0900 Subject: [PATCH] mv contrib/seccomp/kernelversion pkg/kernelversion The package isn't really relevant to seccomp Signed-off-by: Akihiro Suda --- contrib/seccomp/seccomp_default.go | 2 +- core/mount/losetup_linux.go | 2 +- core/mount/mount_idmapped_linux_test.go | 2 +- pkg/cri/config/config_kernel_linux.go | 2 +- pkg/cri/config/config_kernel_linux_test.go | 2 +- {contrib/seccomp => pkg}/kernelversion/kernel_linux.go | 2 ++ {contrib/seccomp => pkg}/kernelversion/kernel_linux_test.go | 2 ++ plugins/snapshots/overlay/overlayutils/check.go | 2 +- 8 files changed, 10 insertions(+), 6 deletions(-) rename {contrib/seccomp => pkg}/kernelversion/kernel_linux.go (99%) rename {contrib/seccomp => pkg}/kernelversion/kernel_linux_test.go (99%) diff --git a/contrib/seccomp/seccomp_default.go b/contrib/seccomp/seccomp_default.go index f0a34fc1b..0828672a8 100644 --- a/contrib/seccomp/seccomp_default.go +++ b/contrib/seccomp/seccomp_default.go @@ -23,7 +23,7 @@ import ( "golang.org/x/sys/unix" - "github.com/containerd/containerd/v2/contrib/seccomp/kernelversion" + "github.com/containerd/containerd/v2/pkg/kernelversion" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/core/mount/losetup_linux.go b/core/mount/losetup_linux.go index 44852b955..2d3d313da 100644 --- a/core/mount/losetup_linux.go +++ b/core/mount/losetup_linux.go @@ -25,8 +25,8 @@ import ( "time" "unsafe" - kernel "github.com/containerd/containerd/v2/contrib/seccomp/kernelversion" "github.com/containerd/containerd/v2/internal/randutil" + kernel "github.com/containerd/containerd/v2/pkg/kernelversion" "golang.org/x/sys/unix" ) diff --git a/core/mount/mount_idmapped_linux_test.go b/core/mount/mount_idmapped_linux_test.go index c18c658c0..1dd36d2e3 100644 --- a/core/mount/mount_idmapped_linux_test.go +++ b/core/mount/mount_idmapped_linux_test.go @@ -23,7 +23,7 @@ import ( "syscall" "testing" - kernel "github.com/containerd/containerd/v2/contrib/seccomp/kernelversion" + kernel "github.com/containerd/containerd/v2/pkg/kernelversion" "github.com/containerd/continuity/testutil" "github.com/stretchr/testify/require" "golang.org/x/sys/unix" diff --git a/pkg/cri/config/config_kernel_linux.go b/pkg/cri/config/config_kernel_linux.go index 8986ede45..9da860750 100644 --- a/pkg/cri/config/config_kernel_linux.go +++ b/pkg/cri/config/config_kernel_linux.go @@ -23,7 +23,7 @@ import ( "errors" "fmt" - kernel "github.com/containerd/containerd/v2/contrib/seccomp/kernelversion" + kernel "github.com/containerd/containerd/v2/pkg/kernelversion" ) var kernelGreaterEqualThan = kernel.GreaterEqualThan diff --git a/pkg/cri/config/config_kernel_linux_test.go b/pkg/cri/config/config_kernel_linux_test.go index c9e2f7912..703178282 100644 --- a/pkg/cri/config/config_kernel_linux_test.go +++ b/pkg/cri/config/config_kernel_linux_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - kernel "github.com/containerd/containerd/v2/contrib/seccomp/kernelversion" + kernel "github.com/containerd/containerd/v2/pkg/kernelversion" "github.com/stretchr/testify/assert" ) diff --git a/contrib/seccomp/kernelversion/kernel_linux.go b/pkg/kernelversion/kernel_linux.go similarity index 99% rename from contrib/seccomp/kernelversion/kernel_linux.go rename to pkg/kernelversion/kernel_linux.go index ab288fbb8..a8cec6481 100644 --- a/contrib/seccomp/kernelversion/kernel_linux.go +++ b/pkg/kernelversion/kernel_linux.go @@ -12,7 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. +*/ +/* File copied and customized based on https://github.com/moby/moby/tree/v20.10.14/profiles/seccomp/kernel_linux.go */ diff --git a/contrib/seccomp/kernelversion/kernel_linux_test.go b/pkg/kernelversion/kernel_linux_test.go similarity index 99% rename from contrib/seccomp/kernelversion/kernel_linux_test.go rename to pkg/kernelversion/kernel_linux_test.go index a45e1912d..01a7ecb5a 100644 --- a/contrib/seccomp/kernelversion/kernel_linux_test.go +++ b/pkg/kernelversion/kernel_linux_test.go @@ -12,7 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. +*/ +/* File copied and customized based on https://github.com/moby/moby/tree/v20.10.14/profiles/seccomp/kernel_linux_test.go */ diff --git a/plugins/snapshots/overlay/overlayutils/check.go b/plugins/snapshots/overlay/overlayutils/check.go index 8b035a2d9..5aedf6cb3 100644 --- a/plugins/snapshots/overlay/overlayutils/check.go +++ b/plugins/snapshots/overlay/overlayutils/check.go @@ -26,8 +26,8 @@ import ( "golang.org/x/sys/unix" - kernel "github.com/containerd/containerd/v2/contrib/seccomp/kernelversion" "github.com/containerd/containerd/v2/core/mount" + kernel "github.com/containerd/containerd/v2/pkg/kernelversion" "github.com/containerd/containerd/v2/pkg/userns" "github.com/containerd/continuity/fs" "github.com/containerd/log"