github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-11 12:52:23 +00:00
Code Issues Projects Releases Wiki Activity

rootless: RunningInUserNS() is now part of userns namespace

Browse Source 
Previously part of the "system" namespace, the RunningInUserNS() has
been moved to the "userns" namespace.

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
This commit is contained in:
Fabiano Fidêncio 2021-07-26 08:11:41 +02:00
parent b5293c5214
commit c0f801c0c4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/runtime/virtcontainers/pkg/rootless/rootless.go
View File

@ -30,7 +30,7 @@ import (
"sync" "sync"
"github.com/containernetworking/plugins/pkg/ns" "github.com/containernetworking/plugins/pkg/ns"
"github.com/opencontainers/runc/libcontainer/system" "github.com/opencontainers/runc/libcontainer/userns"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )
@ -78,7 +78,7 @@ func isRootlessFunc() bool {
if os.Geteuid() != 0 { if os.Geteuid() != 0 {
return true return true
} }
if system.RunningInUserNS() { if userns.RunningInUserNS() {
return true return true
} }
SetRootless(false) SetRootless(false)

4
src/runtime/virtcontainers/pkg/rootless/rootless_test.go
View File

@ -9,7 +9,7 @@ import (
"os" "os"
"testing" "testing"
"github.com/opencontainers/runc/libcontainer/system" "github.com/opencontainers/runc/libcontainer/userns"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
@ -21,7 +21,7 @@ func TestIsRootless(t *testing.T) {
if os.Getuid() != 0 { if os.Getuid() != 0 {
rootless = true rootless = true
} else { } else {
rootless = system.RunningInUserNS() rootless = userns.RunningInUserNS()
} }
assert.Equal(rootless, isRootlessFunc()) assert.Equal(rootless, isRootlessFunc())