Update runtime-spec, drop deprecated RDT fields

Drop IntelRdt.EnableCMT and EnableMBM, and switch to EnableMonitoring
to match upstream runtime-spec.

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

Author: askervin

cmd/cdi/go.mod

@@ -4,7 +4,7 @@ go 1.20
 
 require (
 	github.com/fsnotify/fsnotify v1.5.1
-	github.com/opencontainers/runtime-spec v1.1.0
+	github.com/opencontainers/runtime-spec v1.2.2-0.20250804081626-bfdffd548aa6
 	github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626
 	github.com/spf13/cobra v1.6.0
 	gopkg.in/yaml.v3 v3.0.1

go.mod

@@ -4,7 +4,7 @@ go 1.20
 
 require (
 	github.com/fsnotify/fsnotify v1.5.1
-	github.com/opencontainers/runtime-spec v1.1.0
+	github.com/opencontainers/runtime-spec v1.2.2-0.20250804081626-bfdffd548aa6
 	github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626
 	github.com/stretchr/testify v1.7.0
 	golang.org/x/sys v0.19.0

go.sum

@@ -15,8 +15,8 @@ github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9
 github.com/mndrix/tap-go v0.0.0-20171203230836-629fa407e90b/go.mod h1:pzzDgJWZ34fGzaAZGFW22KVZDfyrYW+QABMrWnJBnSs=
 github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ=
 github.com/opencontainers/runtime-spec v1.0.3-0.20220825212826-86290f6a00fb/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
-github.com/opencontainers/runtime-spec v1.1.0 h1:HHUyrt9mwHUjtasSbXSMvs4cyFxh+Bll4AjJ9odEGpg=
-github.com/opencontainers/runtime-spec v1.1.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
+github.com/opencontainers/runtime-spec v1.2.2-0.20250804081626-bfdffd548aa6 h1:6S6r1L8VO9b1UfgIQi+nteqlElma9KDlzZw/nM3ctI0=
+github.com/opencontainers/runtime-spec v1.2.2-0.20250804081626-bfdffd548aa6/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626 h1:DmNGcqH3WDbV5k8OJ+esPWbqUOX5rMLR2PMvziDMJi0=
 github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626/go.mod h1:BRHJJd0E+cx42OybVYSgUvZmU0B8P9gZuRXlZUP7TKI=
 github.com/opencontainers/selinux v1.9.1/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI=

pkg/cdi/container-edits_test.go

@@ -524,21 +524,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",
-					EnableCMT:     true,
-					EnableMBM:     true,
+					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",
-						EnableCMT:     true,
-						EnableMBM:     true,
+						ClosID:           "clos-1",
+						L3CacheSchema:    "L3:0=ff;1=ff",
+						MemBwSchema:      "MB:0=50;1=50",
+						EnableMonitoring: true,
 					},
 				},
 			},
@@ -548,11 +546,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",
-						EnableCMT:     true,
-						EnableMBM:     true,
+						ClosID:           "clos-1",
+						L3CacheSchema:    "L3:0=ff",
+						MemBwSchema:      "MB:0=100",
+						EnableMonitoring: true,
 					},
 				},
 			},

pkg/cdi/oci.go

@@ -56,10 +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,
-		EnableCMT:     i.EnableCMT,
-		EnableMBM:     i.EnableMBM,
+		ClosID:           i.ClosID,
+		L3CacheSchema:    i.L3CacheSchema,
+		MemBwSchema:      i.MemBwSchema,
+		EnableMonitoring: i.EnableMonitoring,
 	}
 }

specs-go/config.go

@@ -64,9 +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"`
-	EnableCMT     bool   `json:"enableCMT,omitempty"     yaml:"enableCMT,omitempty"`
-	EnableMBM     bool   `json:"enableMBM,omitempty"     yaml:"enableMBM,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"`
 }