diff --git a/pkg/runtimeproxy/resexecutor/cri/utils.go b/pkg/runtimeproxy/resexecutor/cri/utils.go index aedfc01a1..989f9eb5e 100644 --- a/pkg/runtimeproxy/resexecutor/cri/utils.go +++ b/pkg/runtimeproxy/resexecutor/cri/utils.go @@ -86,12 +86,10 @@ func updateResource(a, b *v1alpha1.LinuxContainerResources) *v1alpha1.LinuxConta if b.OomScoreAdj >= -1000 && b.OomScoreAdj <= 1000 { a.OomScoreAdj = b.OomScoreAdj } - if b.CpusetCpus != "" { - a.CpusetCpus = b.CpusetCpus - } - if b.CpusetMems != "" { - a.CpusetMems = b.CpusetMems - } + + a.CpusetCpus = b.CpusetCpus + a.CpusetMems = b.CpusetMems + a.Unified = utils.MergeMap(a.Unified, b.Unified) if b.MemorySwapLimitInBytes > 0 { a.MemorySwapLimitInBytes = b.MemorySwapLimitInBytes