Merge pull request #3583 from giuseppe/ulimit-host-not-set

spec: simplify handling of --ulimit host
containers · Jul 17, 2019 · 1c02905 · 1c02905
2 parents 04a9cb0 + 2f0ed53
commit 1c02905
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 62 deletions.
diff --git a/pkg/spec/spec.go b/pkg/spec/spec.go
@@ -20,12 +20,6 @@ import (
 
 const cpuPeriod = 100000
 
-type systemUlimit struct {
-	name string
-	max  uint64
-	cur  uint64
-}
-
 func getAvailableGids() (int64, error) {
 	idMap, err := user.ParseIDMapFile("/proc/self/gid_map")
 	if err != nil {
@@ -585,13 +579,7 @@ func addRlimits(config *CreateConfig, g *generate.Generator) error {
 			if len(config.Resources.Ulimit) != 1 {
 				return errors.New("ulimit can use host only once")
 			}
-			hostLimits, err := getHostRlimits()
-			if err != nil {
-				return err
-			}
-			for _, i := range hostLimits {
-				g.AddProcessRlimits(i.name, i.max, i.cur)
-			}
+			g.Config.Process.Rlimits = nil
 			break
 		}
 

diff --git a/pkg/spec/spec_linux.go b/pkg/spec/spec_linux.go
diff --git a/pkg/spec/spec_unsupported.go b/pkg/spec/spec_unsupported.go