Merge pull request #14654 from cdoern/cgroup

podman cgroup enhancement

2 files changed, 14 insertions, 22 deletions

diff --git a/pkg/specgen/generate/container_create.go b/pkg/specgen/generate/container_create.go
index 0dec943d1..6b2e90b22 100644
--- a/pkg/specgen/generate/container_create.go
+++ b/pkg/specgen/generate/container_create.go
@@ -180,10 +180,23 @@ func MakeContainer(ctx context.Context, rt *libpod.Runtime, s *specgen.SpecGener
 			if err != nil {
 				return nil, nil, nil, err
 			}
+			resources := runtimeSpec.Linux.Resources
+
+			// resources get overwrritten similarly to pod inheritance, manually assign here if there is a new value
+			marshalRes, err := json.Marshal(resources)
+			if err != nil {
+				return nil, nil, nil, err
+			}
+
 			err = json.Unmarshal(out, runtimeSpec.Linux)
 			if err != nil {
 				return nil, nil, nil, err
 			}
+
+			err = json.Unmarshal(marshalRes, runtimeSpec.Linux.Resources)
+			if err != nil {
+				return nil, nil, nil, err
+			}
 		}
 		if s.ResourceLimits != nil {
 			switch {
diff --git a/pkg/specgen/generate/oci.go b/pkg/specgen/generate/oci.go
index 19f55c9d8..1044854f4 100644
--- a/pkg/specgen/generate/oci.go
+++ b/pkg/specgen/generate/oci.go
@@ -298,8 +298,7 @@ func SpecGenToOCI(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.Runt
 		g.AddAnnotation(key, val)
 	}
 
-	switch {
-	case compatibleOptions.InfraResources == nil && s.ResourceLimits != nil:
+	if s.ResourceLimits != nil {
 		out, err := json.Marshal(s.ResourceLimits)
 		if err != nil {
 			return nil, err
@@ -308,29 +307,9 @@ func SpecGenToOCI(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.Runt
 		if err != nil {
 			return nil, err
 		}
-	case s.ResourceLimits != nil: // if we have predefined resource limits we need to make sure we keep the infra and container limits
-		originalResources, err := json.Marshal(s.ResourceLimits)
-		if err != nil {
-			return nil, err
-		}
-		infraResources, err := json.Marshal(compatibleOptions.InfraResources)
-		if err != nil {
-			return nil, err
-		}
-		err = json.Unmarshal(infraResources, s.ResourceLimits) // put infra's resource limits in the container
-		if err != nil {
-			return nil, err
-		}
-		err = json.Unmarshal(originalResources, s.ResourceLimits) // make sure we did not override anything
-		if err != nil {
-			return nil, err
-		}
 		g.Config.Linux.Resources = s.ResourceLimits
-	default:
-		g.Config.Linux.Resources = compatibleOptions.InfraResources
 	}
 	// Devices
-
 	// set the default rule at the beginning of device configuration
 	if !inUserNS && !s.Privileged {
 		g.AddLinuxResourcesDevice(false, "", nil, nil, "rwm")