From 3ebd90eabc93bb2c24a706919528627058680bbd Mon Sep 17 00:00:00 2001 From: Antti Kervinen Date: Tue, 5 Aug 2025 17:24:57 +0300 Subject: [PATCH] Drop RDT fields deprecated in runtime-spec Drop IntelRdt.EnableCMT and EnableMBM to match runtime-spec versions after v1.2.1. Signed-off-by: Antti Kervinen --- pkg/cdi/container-edits_test.go | 6 ------ pkg/cdi/oci.go | 2 -- specs-go/config.go | 2 -- 3 files changed, 10 deletions(-) diff --git a/pkg/cdi/container-edits_test.go b/pkg/cdi/container-edits_test.go index 9f01a6eb..ace0fd2e 100644 --- a/pkg/cdi/container-edits_test.go +++ b/pkg/cdi/container-edits_test.go @@ -527,8 +527,6 @@ func TestApplyContainerEdits(t *testing.T) { ClosID: "clos-1", L3CacheSchema: "L3:0=ff;1=ff", MemBwSchema: "MB:0=50;1=50", - EnableCMT: true, - EnableMBM: true, }, }, result: &oci.Spec{ @@ -537,8 +535,6 @@ func TestApplyContainerEdits(t *testing.T) { ClosID: "clos-1", L3CacheSchema: "L3:0=ff;1=ff", MemBwSchema: "MB:0=50;1=50", - EnableCMT: true, - EnableMBM: true, }, }, }, @@ -551,8 +547,6 @@ func TestApplyContainerEdits(t *testing.T) { ClosID: "clos-1", L3CacheSchema: "L3:0=ff", MemBwSchema: "MB:0=100", - EnableCMT: true, - EnableMBM: true, }, }, }, diff --git a/pkg/cdi/oci.go b/pkg/cdi/oci.go index 4d62c41f..e7d18cdc 100644 --- a/pkg/cdi/oci.go +++ b/pkg/cdi/oci.go @@ -59,7 +59,5 @@ func (i *IntelRdt) toOCI() *spec.LinuxIntelRdt { ClosID: i.ClosID, L3CacheSchema: i.L3CacheSchema, MemBwSchema: i.MemBwSchema, - EnableCMT: i.EnableCMT, - EnableMBM: i.EnableMBM, } } diff --git a/specs-go/config.go b/specs-go/config.go index f28657b8..6f403e63 100644 --- a/specs-go/config.go +++ b/specs-go/config.go @@ -67,6 +67,4 @@ 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"` }