KEP-3857: Recursive Read-only (RRO) mounts

cmd/crictl/container.go

@@ -942,7 +942,7 @@ func ContainerStatus(client internalapi.RuntimeService, id, output string, tmplS
 
 	switch output {
 	case "json", "yaml", "go-template":
-		return outputStatusInfo(status, r.Info, output, tmplStr)
+		return outputStatusInfo(status, "", r.Info, output, tmplStr)
 	case "table": // table output is after this switch block
 	default:
 		return fmt.Errorf("output option cannot be %s", output)

cmd/crictl/image.go

@@ -323,7 +323,7 @@ var imageStatusCommand = &cli.Command{
 			}
 			switch output {
 			case "json", "yaml", "go-template":
-				if err := outputStatusInfo(status, r.Info, output, tmplStr); err != nil {
+				if err := outputStatusInfo(status, "", r.Info, output, tmplStr); err != nil {
 					return fmt.Errorf("output status for %q: %w", id, err)
 				}
 				continue
@@ -521,7 +521,7 @@ var imageFsInfoCommand = &cli.Command{
 
 		switch output {
 		case "json", "yaml", "go-template":
-			if err := outputStatusInfo(status, nil, output, tmplStr); err != nil {
+			if err := outputStatusInfo(status, "", nil, output, tmplStr); err != nil {
 				return fmt.Errorf("output filesystem info: %w", err)
 			}
 			return nil

cmd/crictl/info.go

@@ -18,6 +18,7 @@ package main
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 
 	"github.com/sirupsen/logrus"
@@ -79,5 +80,9 @@ func Info(cliContext *cli.Context, client internalapi.RuntimeService) error {
 	if err != nil {
 		return err
 	}
-	return outputStatusInfo(status, r.Info, cliContext.String("output"), cliContext.String("template"))
+	handlers, err := json.Marshal(r.RuntimeHandlers) // protobufObjectToJSON cannot be used
+	if err != nil {
+		return err
+	}
+	return outputStatusInfo(status, string(handlers), r.Info, cliContext.String("output"), cliContext.String("template"))
 }

cmd/crictl/sandbox.go

@@ -404,7 +404,7 @@ func PodSandboxStatus(client internalapi.RuntimeService, id, output string, quie
 	}
 	switch output {
 	case "json", "yaml", "go-template":
-		return outputStatusInfo(status, r.Info, output, tmplStr)
+		return outputStatusInfo(status, "", r.Info, output, tmplStr)
 	case "table": // table output is after this switch block
 	default:
 		return fmt.Errorf("output option cannot be %s", output)

cmd/crictl/util.go

@@ -231,7 +231,7 @@ func outputProtobufObjAsYAML(obj proto.Message) error {
 	return nil
 }
 
-func outputStatusInfo(status string, info map[string]string, format string, tmplStr string) error {
+func outputStatusInfo(status, handlers string, info map[string]string, format string, tmplStr string) error {
 	// Sort all keys
 	keys := []string{}
 	for k := range info {
@@ -240,6 +240,9 @@ func outputStatusInfo(status string, info map[string]string, format string, tmpl
 	sort.Strings(keys)
 
 	jsonInfo := "{" + "\"status\":" + status + ","
+	if handlers != "" {
+		jsonInfo += "\"runtimeHandlers\":" + handlers + ","
+	}
 	for _, k := range keys {
 		var res interface{}
 		// We attempt to convert key into JSON if possible else use it directly

pkg/validate/container_linux.go

@@ -307,3 +307,199 @@ func createOOMKilledContainer(
 
 	return containerID
 }
+
+var _ = framework.KubeDescribe("Container Mount Readonly", func() {
+	f := framework.NewDefaultCRIFramework()
+
+	var rc internalapi.RuntimeService
+	var ic internalapi.ImageManagerService
+
+	BeforeEach(func() {
+		rc = f.CRIClient.CRIRuntimeClient
+		ic = f.CRIClient.CRIImageClient
+	})
+
+	Context("runtime should support readonly mounts", func() {
+		var podID string
+		var podConfig *runtimeapi.PodSandboxConfig
+
+		BeforeEach(func() {
+			podID, podConfig = createPrivilegedPodSandbox(rc, true)
+		})
+
+		AfterEach(func() {
+			By("stop PodSandbox")
+			rc.StopPodSandbox(context.TODO(), podID)
+			By("delete PodSandbox")
+			rc.RemovePodSandbox(context.TODO(), podID)
+		})
+
+		testRRO := func(rc internalapi.RuntimeService, ic internalapi.ImageManagerService, rro bool) {
+			if rro && !runtimeSupportsRRO(rc, framework.TestContext.RuntimeHandler) {
+				Skip("runtime does not implement recursive readonly mounts")
+				return
+			}
+
+			By("create host path")
+			hostPath, clearHostPath := createHostPathForRROMount(podID)
+			defer clearHostPath() // clean up the TempDir
+
+			By("create container with volume")
+			containerID := createRROMountContainer(rc, ic, podID, podConfig, hostPath, "/mnt", rro)
+
+			By("test start container with volume")
+			testStartContainer(rc, containerID)
+
+			By("check whether `touch /mnt/tmpfs/file` succeeds")
+			command := []string{"touch", "/mnt/tmpfs/file"}
+			if rro {
+				command = []string{"sh", "-c", `touch /mnt/tmpfs/foo 2>&1 | grep -q "Read-only file system"`}
+			}
+			execSyncContainer(rc, containerID, command)
+		}
+
+		It("should support non-recursive readonly mounts", func() {
+			testRRO(rc, ic, false)
+		})
+		It("should support recursive readonly mounts", func() {
+			testRRO(rc, ic, true)
+		})
+		testRROInvalidPropagation := func(prop runtimeapi.MountPropagation) {
+			if !runtimeSupportsRRO(rc, framework.TestContext.RuntimeHandler) {
+				Skip("runtime does not implement recursive readonly mounts")
+				return
+			}
+			hostPath, clearHostPath := createHostPathForRROMount(podID)
+			defer clearHostPath() // clean up the TempDir
+			mounts := []*runtimeapi.Mount{
+				{
+					HostPath:          hostPath,
+					ContainerPath:     "/mnt",
+					Readonly:          true,
+					RecursiveReadOnly: true,
+					SelinuxRelabel:    true,
+					Propagation:       prop,
+				},
+			}
+			const expectErr = true
+			createMountContainer(rc, ic, podID, podConfig, mounts, expectErr)
+		}
+		It("should reject a recursive readonly mount with PROPAGATION_HOST_TO_CONTAINER", func() {
+			testRROInvalidPropagation(runtimeapi.MountPropagation_PROPAGATION_HOST_TO_CONTAINER)
+		})
+		It("should reject a recursive readonly mount with PROPAGATION_BIDIRECTIONAL", func() {
+			testRROInvalidPropagation(runtimeapi.MountPropagation_PROPAGATION_BIDIRECTIONAL)
+		})
+		It("should reject a recursive readonly mount with ReadOnly: false", func() {
+			if !runtimeSupportsRRO(rc, framework.TestContext.RuntimeHandler) {
+				Skip("runtime does not implement recursive readonly mounts")
+				return
+			}
+			hostPath, clearHostPath := createHostPathForRROMount(podID)
+			defer clearHostPath() // clean up the TempDir
+			mounts := []*runtimeapi.Mount{
+				{
+					HostPath:          hostPath,
+					ContainerPath:     "/mnt",
+					Readonly:          false,
+					RecursiveReadOnly: true,
+					SelinuxRelabel:    true,
+				},
+			}
+			const expectErr = true
+			createMountContainer(rc, ic, podID, podConfig, mounts, expectErr)
+		})
+	})
+})
+
+func runtimeSupportsRRO(rc internalapi.RuntimeService, runtimeHandlerName string) bool {
+	ctx := context.Background()
+	status, err := rc.Status(ctx, false)
+	framework.ExpectNoError(err, "failed to check runtime status")
+	for _, h := range status.RuntimeHandlers {
+		if h.Name == runtimeHandlerName {
+			if f := h.Features; f != nil {
+				return f.RecursiveReadOnlyMounts
+			}
+		}
+	}
+	return false
+}
+
+// createHostPathForRROMount creates the hostPath for RRO mount test.
+//
+// hostPath contains a "tmpfs" directory with tmpfs mounted on it.
+func createHostPathForRROMount(podID string) (string, func()) {
+	hostPath, err := os.MkdirTemp("", "test"+podID)
+	framework.ExpectNoError(err, "failed to create TempDir %q: %v", hostPath, err)
+
+	tmpfsMntPoint := filepath.Join(hostPath, "tmpfs")
+	err = os.MkdirAll(tmpfsMntPoint, 0700)
+	framework.ExpectNoError(err, "failed to create tmpfs dir %q: %v", tmpfsMntPoint, err)
+
+	err = unix.Mount("none", tmpfsMntPoint, "tmpfs", 0, "")
+	framework.ExpectNoError(err, "failed to mount tmpfs on dir %q: %v", tmpfsMntPoint, err)
+
+	clearHostPath := func() {
+		By("clean up the TempDir")
+		err := unix.Unmount(tmpfsMntPoint, unix.MNT_DETACH)
+		framework.ExpectNoError(err, "failed to unmount \"tmpfsMntPoint\": %v", err)
+		err = os.RemoveAll(hostPath)
+		framework.ExpectNoError(err, "failed to remove \"hostPath\": %v", err)
+	}
+
+	return hostPath, clearHostPath
+}
+
+func createRROMountContainer(
+	rc internalapi.RuntimeService,
+	ic internalapi.ImageManagerService,
+	podID string,
+	podConfig *runtimeapi.PodSandboxConfig,
+	hostPath, containerPath string,
+	rro bool,
+) string {
+	mounts := []*runtimeapi.Mount{
+		{
+			HostPath:          hostPath,
+			ContainerPath:     containerPath,
+			Readonly:          true,
+			RecursiveReadOnly: rro,
+			SelinuxRelabel:    true,
+		},
+	}
+	return createMountContainer(rc, ic, podID, podConfig, mounts, false)
+}
+
+func createMountContainer(
+	rc internalapi.RuntimeService,
+	ic internalapi.ImageManagerService,
+	podID string,
+	podConfig *runtimeapi.PodSandboxConfig,
+	mounts []*runtimeapi.Mount,
+	expectErr bool,
+) string {
+	By("create a container with volume and name")
+	containerName := "test-mount-" + framework.NewUUID()
+	containerConfig := &runtimeapi.ContainerConfig{
+		Metadata: framework.BuildContainerMetadata(containerName, framework.DefaultAttempt),
+		Image:    &runtimeapi.ImageSpec{Image: framework.TestContext.TestImageList.DefaultTestContainerImage},
+		Command:  pauseCmd,
+		Mounts:   mounts,
+	}
+
+	if expectErr {
+		_, err := framework.CreateContainerWithError(rc, ic, containerConfig, podID, podConfig)
+		Expect(err).To(HaveOccurred())
+		return ""
+	}
+
+	containerID := framework.CreateContainer(rc, ic, containerConfig, podID, podConfig)
+
+	By("verifying container status")
+	resp, err := rc.ContainerStatus(context.TODO(), containerID, true)
+	framework.ExpectNoError(err, "unable to get container status")
+	Expect(len(resp.Status.Mounts), len(mounts))
+
+	return containerID
+}