Merge pull request #5627 from payall4u/payall4u/cri-support-cgroup-v2

2021-09-09 23:10:33 +08:00
parent d040ca3845 f8dfbee178
commit d58542a9d1
3 changed files with 62 additions and 0 deletions
--- a/pkg/cri/opts/spec_linux.go
+++ b/pkg/cri/opts/spec_linux.go
@@ -488,6 +488,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
 	}
 }