Remove rootless functionality

- [x] Read the [Contributing document](../blob/-/.github/CONTRIBUTING.md). Summary --------------- Remove rootless functionality Context: cloudfoundry/garden-runc-release#196 Backward Compatibility --------------- Breaking Change? **No** Signed-off-by: Amin Jamali <[email protected]>
cloudfoundry · Apr 19, 2024 · db123da · db123da
1 parent 3ecff94
commit db123da
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 103 deletions.
diff --git a/devices_test.go b/devices_test.go
@@ -40,7 +40,6 @@ var _ = Describe("Devices", func() {
 
 	Context("in a privileged container", func() {
 		BeforeEach(func() {
-			skipIfRootless()
 			privilegedContainer = true
 		})
 

diff --git a/garden_integration_tests_suite_test.go b/garden_integration_tests_suite_test.go
@@ -226,22 +226,6 @@ func getKernelVersion() (int, int) {
 	return major, minor
 }
 
-func skipIfRootless() {
-	if rootless() {
-		Skip("behaviour being tested is either not relevant or not implemented in rootless")
-	}
-}
-
-func skipIfNotRootless() {
-	if !rootless() {
-		Skip("behaviour being tested is specific to rootless")
-	}
-}
-
-func rootless() bool {
-	return os.Getenv("ROOTLESS") != "false"
-}
-
 func skipIfWoot(reason string) {
 	if woot() {
 		Skip("Skipping this test because I am WOOT: " + reason)
@@ -274,7 +258,6 @@ func isContainerdForProcesses() bool {
 
 func setPrivileged() {
 	privilegedContainer = true
-	skipIfRootless()
 }
 
 func runProcessWithIO(container garden.Container, processSpec garden.ProcessSpec, pio garden.ProcessIO) int {

diff --git a/lifecycle_test.go b/lifecycle_test.go
@@ -122,9 +122,6 @@ var _ = Describe("Lifecycle", func() {
 		})
 
 		mappingSize := `0\s+4294967294\s+1\n\s+1\s+1\s+4294967293`
-		if rootless() {
-			mappingSize = `0\s+4294967294\s+1\n\s+1\s+65536\s+4294901758`
-		}
 		Expect(stdout).To(gbytes.Say(mappingSize))
 	}
 
@@ -1365,23 +1362,6 @@ done
 				})
 			})
 
-			Context("when running rootless", func() {
-				BeforeEach(func() {
-					if runtime.GOOS == "windows" {
-						Skip("pending for windows")
-					}
-					if !rootless() {
-						Skip("this behaviour only makes sense when rootless")
-					}
-					privilegedContainer = true
-					assertContainerCreate = false
-				})
-
-				It("cannot create privileged containers", func() {
-					Expect(containerCreateErr).To(MatchError("privileged container creation is disabled"))
-				})
-			})
-
 			It("streams in relative to the default run directory", func() {
 				err := container.StreamIn(garden.StreamInSpec{
 					User:      regularUser,

diff --git a/networking_test.go b/networking_test.go
@@ -22,7 +22,6 @@ var _ = Describe("Networking", func() {
 		if runtime.GOOS == "windows" {
 			Skip("pending for windows")
 		}
-		skipIfRootless()
 	})
 
 	It("can be contacted after a NetIn", func() {

diff --git a/process_test.go b/process_test.go
@@ -330,10 +330,6 @@ var _ = Describe("Process", func() {
 			})
 
 			Context("when working directory does not exist", func() {
-				BeforeEach(func() {
-					skipIfRootless()
-				})
-
 				It("spawns the process", func() {
 					if runtime.GOOS == "windows" {
 						stdout := runForStdout(container, garden.ProcessSpec{
@@ -401,10 +397,6 @@ var _ = Describe("Process", func() {
 			})
 
 			Context("when working directory does not exist", func() {
-				BeforeEach(func() {
-					skipIfRootless()
-				})
-
 				It("should create the working directory, and succeed", func() {
 					exitCode, _, _ := runProcess(container, garden.ProcessSpec{
 						User: "alice",

diff --git a/security_test.go b/security_test.go
@@ -310,34 +310,13 @@ var _ = Describe("Security", func() {
 		})
 
 		Context("when running a command as root", func() {
-			When("not rootless", func() {
-				BeforeEach(func() {
-					skipIfRootless()
-				})
-
-				It("executes with uid 0, gid 0, and supplementary gids from /etc/group", func() {
-					stdout := runForStdout(container, garden.ProcessSpec{
-						User: "root",
-						Path: "/bin/sh",
-						Args: []string{"-c", "id -u; id -g; id -G"},
-					})
-					Expect(stdout).To(gbytes.Say("0\n0\n0 10\n"))
-				})
-			})
-
-			When("rootless", func() {
-				BeforeEach(func() {
-					skipIfNotRootless()
-				})
-
-				It("executes with uid 0, gid 0, and no supplementary gids", func() {
-					stdout := runForStdout(container, garden.ProcessSpec{
-						User: "root",
-						Path: "/bin/sh",
-						Args: []string{"-c", "id -u; id -g; id -G"},
-					})
-					Expect(stdout).To(gbytes.Say("0\n0\n0\n"))
+			It("executes with uid 0, gid 0, and supplementary gids from /etc/group", func() {
+				stdout := runForStdout(container, garden.ProcessSpec{
+					User: "root",
+					Path: "/bin/sh",
+					Args: []string{"-c", "id -u; id -g; id -G"},
 				})
+				Expect(stdout).To(gbytes.Say("0\n0\n0 10\n"))
 			})
 
 			It("sets $HOME, $USER, and $PATH", func() {

diff --git a/user_test.go b/user_test.go
@@ -61,37 +61,14 @@ var _ = Describe("users", func() {
 			imageRef.URI = "docker:///cloudfoundry/garden-rootfs"
 		})
 
-		When("not rootless", func() {
-			BeforeEach(func() {
-				skipIfRootless()
-			})
-
-			It("ignores inherited groups from gdn but includes supplementary groups", func() {
-				stdout := runForStdout(container, garden.ProcessSpec{
-					User: "alice",
-					Path: "cat",
-					Args: []string{"/proc/self/status"},
-				})
-
-				Expect(stdout).To(gbytes.Say(`Groups:(\s)*1010(\s)*1011(\s)*\n`))
-			})
-		})
-
-		When("running as rootless", func() {
-			BeforeEach(func() {
-				skipIfNotRootless()
-			})
-
-			It("ignores inherited groups from gdn and supplementary groups", func() {
-				stdout := runForStdout(container, garden.ProcessSpec{
-					User: "alice",
-					Path: "cat",
-					Args: []string{"/proc/self/status"},
-				})
-
-				Expect(stdout).To(gbytes.Say(`Groups:\s*\n`))
+		It("ignores inherited groups from gdn but includes supplementary groups", func() {
+			stdout := runForStdout(container, garden.ProcessSpec{
+				User: "alice",
+				Path: "cat",
+				Args: []string{"/proc/self/status"},
 			})
 
+			Expect(stdout).To(gbytes.Say(`Groups:(\s)*1010(\s)*1011(\s)*\n`))
 		})
 	})