From 3f23a736cb28933d0c3c417127a4877e996cac50 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 4 Jun 2021 17:46:25 +0200 Subject: [PATCH 1/2] libcontainer/configs: remove stubs for deprecated Devices funcs These were deprecated and moved; the stubs were included in the last two (rc94, rc95) releases, so external consumers would have the chance to update their code. Removing this so that this doesn't get into v1.0.0 GA Signed-off-by: Sebastiaan van Stijn --- libcontainer/configs/devices.go | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 libcontainer/configs/devices.go diff --git a/libcontainer/configs/devices.go b/libcontainer/configs/devices.go deleted file mode 100644 index b9e3664ceaa..00000000000 --- a/libcontainer/configs/devices.go +++ /dev/null @@ -1,17 +0,0 @@ -package configs - -import "github.com/opencontainers/runc/libcontainer/devices" - -type ( - // Deprecated: use libcontainer/devices.Device - Device = devices.Device - - // Deprecated: use libcontainer/devices.Rule - DeviceRule = devices.Rule - - // Deprecated: use libcontainer/devices.Type - DeviceType = devices.Type - - // Deprecated: use libcontainer/devices.Permissions - DevicePermissions = devices.Permissions -) From 8fe3dfbb88ba23d1e1e3b11b4fa52b5b60670e6f Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 4 Jun 2021 17:48:48 +0200 Subject: [PATCH 2/2] libcontainer/system: remove alias for deprecated RunningInUserNS These were deprecated and moved; the stubs were included in the last two (rc94, rc95) releases, so external consumers would have the chance to update their code. Removing this so that this doesn't get into v1.0.0 GA Signed-off-by: Sebastiaan van Stijn --- libcontainer/system/userns_deprecated.go | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 libcontainer/system/userns_deprecated.go diff --git a/libcontainer/system/userns_deprecated.go b/libcontainer/system/userns_deprecated.go deleted file mode 100644 index 465c1a69323..00000000000 --- a/libcontainer/system/userns_deprecated.go +++ /dev/null @@ -1,7 +0,0 @@ -package system - -import "github.com/opencontainers/runc/libcontainer/userns" - -// RunningInUserNS detects whether we are currently running in a user namespace. -// Deprecated: use github.com/opencontainers/runc/libcontainer/userns.RunningInUserNS instead -var RunningInUserNS = userns.RunningInUserNS