Add new IntelRdt.EnableMonitoring field

Signed-off-by: Antti Kervinen <[email protected]>

Author: askervin

pkg/cdi/container-edits_test.go

@@ -532,17 +532,19 @@ func TestApplyContainerEdits(t *testing.T) {
 			spec: &oci.Spec{},
 			edits: &cdi.ContainerEdits{
 				IntelRdt: &cdi.IntelRdt{
-					ClosID:        "clos-1",
-					L3CacheSchema: "L3:0=ff;1=ff",
-					MemBwSchema:   "MB:0=50;1=50",
+					ClosID:           "clos-1",
+					L3CacheSchema:    "L3:0=ff;1=ff",
+					MemBwSchema:      "MB:0=50;1=50",
+					EnableMonitoring: true,
 				},
 			},
 			result: &oci.Spec{
 				Linux: &oci.Linux{
 					IntelRdt: &oci.LinuxIntelRdt{
-						ClosID:        "clos-1",
-						L3CacheSchema: "L3:0=ff;1=ff",
-						MemBwSchema:   "MB:0=50;1=50",
+						ClosID:           "clos-1",
+						L3CacheSchema:    "L3:0=ff;1=ff",
+						MemBwSchema:      "MB:0=50;1=50",
+						EnableMonitoring: true,
 					},
 				},
 			},
@@ -552,9 +554,10 @@ func TestApplyContainerEdits(t *testing.T) {
 			spec: &oci.Spec{
 				Linux: &oci.Linux{
 					IntelRdt: &oci.LinuxIntelRdt{
-						ClosID:        "clos-1",
-						L3CacheSchema: "L3:0=ff",
-						MemBwSchema:   "MB:0=100",
+						ClosID:           "clos-1",
+						L3CacheSchema:    "L3:0=ff",
+						MemBwSchema:      "MB:0=100",
+						EnableMonitoring: true,
 					},
 				},
 			},

pkg/cdi/oci.go

@@ -56,8 +56,9 @@ func (d *DeviceNode) toOCI() spec.LinuxDevice {
 // toOCI returns the opencontainers runtime Spec LinuxIntelRdt for this IntelRdt config.
 func (i *IntelRdt) toOCI() *spec.LinuxIntelRdt {
 	return &spec.LinuxIntelRdt{
-		ClosID:        i.ClosID,
-		L3CacheSchema: i.L3CacheSchema,
-		MemBwSchema:   i.MemBwSchema,
+		ClosID:           i.ClosID,
+		L3CacheSchema:    i.L3CacheSchema,
+		MemBwSchema:      i.MemBwSchema,
+		EnableMonitoring: i.EnableMonitoring,
 	}
 }

specs-go/config.go

@@ -64,7 +64,8 @@ type Hook struct {
 
 // IntelRdt describes the Linux IntelRdt parameters to set in the OCI spec.
 type IntelRdt struct {
-	ClosID        string `json:"closID,omitempty"        yaml:"closID,omitempty"`
-	L3CacheSchema string `json:"l3CacheSchema,omitempty" yaml:"l3CacheSchema,omitempty"`
-	MemBwSchema   string `json:"memBwSchema,omitempty"   yaml:"memBwSchema,omitempty"`
+	ClosID           string `json:"closID,omitempty"        yaml:"closID,omitempty"`
+	L3CacheSchema    string `json:"l3CacheSchema,omitempty" yaml:"l3CacheSchema,omitempty"`
+	MemBwSchema      string `json:"memBwSchema,omitempty"   yaml:"memBwSchema,omitempty"`
+	EnableMonitoring bool   `json:"enableMonitoring,omitempty"     yaml:"enableMonitoring,omitempty"`
 }