Merge pull request #278 from askervin/5cP_runtimespec_rdtchange

Remove deprecated RDT fields

Author: elezar

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,
 					},
 				},
 			},

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,
 	}
 }

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"`
 }