Merge pull request #286 from marquiz/devel/rdt-root-clos

Allow root CLOS in IntelRdt.closID

Author: elezar

pkg/cdi/container-edits.go

@@ -337,8 +337,10 @@ func ValidateIntelRdt(i *cdi.IntelRdt) error {
 
 // Validate validates the IntelRdt configuration.
 func (i *IntelRdt) Validate() error {
-	// ClosID must be a valid Linux filename
-	if len(i.ClosID) >= 4096 || i.ClosID == "." || i.ClosID == ".." || strings.ContainsAny(i.ClosID, "/\n") {
+	// ClosID must be a valid Linux filename. Exception: "/" refers to the root CLOS.
+	switch c := i.ClosID; {
+	case c == "/":
+	case len(c) >= 4096, c == ".", c == "..", strings.ContainsAny(c, "/\n"):
 		return errors.New("invalid ClosID")
 	}
 	return nil

pkg/cdi/container-edits_test.go

@@ -254,6 +254,14 @@ func TestValidateContainerEdits(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "valid rdt config, root clos",
+			edits: &cdi.ContainerEdits{
+				IntelRdt: &cdi.IntelRdt{
+					ClosID: "/",
+				},
+			},
+		},
 		{
 			name: "invalid rdt config, invalid closID (slash)",
 			edits: &cdi.ContainerEdits{