github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

feature: add field LinuxContainerResources.Unified on cri

Browse Source 
Signed-off-by: Zhiyu Li <payall4u@qq.com>
This commit is contained in:
payall4u 2021-08-11 09:44:56 +08:00
parent ff2e58d114
commit 9a8bf13158
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/cri/opts/spec_linux.go
View File

@ -446,6 +446,15 @@ func WithResources(resources *runtime.LinuxContainerResources, tolerateMissingHu
logrus.Warn("hugetlb cgroup controller is absent. skipping huge pages limits") logrus.Warn("hugetlb cgroup controller is absent. skipping huge pages limits")
} }
} }
if unified := resources.GetUnified(); unified != nil {
if s.Linux.Resources.Unified == nil {
s.Linux.Resources.Unified = make(map[string]string)
}
for k, v := range unified {
s.Linux.Resources.Unified[k] = v
}
}
return nil return nil
} }
} }