feature: add field LinuxContainerResources.Unified on cri

payall4u · payall4u · commit 9a8bf13158e4 · 2021-08-23T10:49:31.000+08:00
Signed-off-by: Zhiyu Li &lt;payall4u@qq.com&gt;
diff --git a/pkg/cri/opts/spec_linux.go b/pkg/cri/opts/spec_linux.go
@@ -446,6 +446,15 @@ func WithResources(resources *runtime.LinuxContainerResources, tolerateMissingHu
 				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
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -446,6 +446,15 @@ func WithResources(resources *runtime.LinuxContainerResources, tolerateMissingHu`
`446`	`446`	`logrus.Warn("hugetlb cgroup controller is absent. skipping huge pages limits")`
`447`	`447`	`}`
`448`	`448`	`}`
	`449`	`+`
	`450`	`+ if unified := resources.GetUnified(); unified != nil {`
	`451`	`+ if s.Linux.Resources.Unified == nil {`
	`452`	`+ s.Linux.Resources.Unified = make(map[string]string)`
	`453`	`+ }`
	`454`	`+ for k, v := range unified {`
	`455`	`+ s.Linux.Resources.Unified[k] = v`
	`456`	`+ }`
	`457`	`+ }`
`449`	`458`	`return nil`
`450`	`459`	`}`
`451`	`460`	`}`