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

spec: simplify handling of  --ulimit host

3 files changed, 1 insertions, 62 deletions

diff --git a/pkg/spec/spec.go b/pkg/spec/spec.go
index 53b73296a..6d8d399f4 100644
--- 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
deleted file mode 100644
index fcdfc5c4e..000000000
--- a/pkg/spec/spec_linux.go
+++ /dev/null
@@ -1,42 +0,0 @@
-//+build linux
-
-package createconfig
-
-import (
-	"syscall"
-
-	"github.com/pkg/errors"
-)
-
-type systemRlimit struct {
-	name  string
-	value int
-}
-
-var systemLimits = []systemRlimit{
-	{"RLIMIT_AS", syscall.RLIMIT_AS},
-	{"RLIMIT_CORE", syscall.RLIMIT_CORE},
-	{"RLIMIT_CPU", syscall.RLIMIT_CPU},
-	{"RLIMIT_DATA", syscall.RLIMIT_DATA},
-	{"RLIMIT_FSIZE", syscall.RLIMIT_FSIZE},
-	{"RLIMIT_NOFILE", syscall.RLIMIT_NOFILE},
-	{"RLIMIT_STACK", syscall.RLIMIT_STACK},
-}
-
-func getHostRlimits() ([]systemUlimit, error) {
-	ret := []systemUlimit{}
-	for _, i := range systemLimits {
-		var l syscall.Rlimit
-		if err := syscall.Getrlimit(i.value, &l); err != nil {
-			return nil, errors.Wrapf(err, "cannot read limits for %s", i.name)
-		}
-		s := systemUlimit{
-			name: i.name,
-			max:  l.Max,
-			cur:  l.Cur,
-		}
-		ret = append(ret, s)
-	}
-	return ret, nil
-
-}
diff --git a/pkg/spec/spec_unsupported.go b/pkg/spec/spec_unsupported.go
deleted file mode 100644
index 0f6a9acdc..000000000
--- a/pkg/spec/spec_unsupported.go
+++ /dev/null
@@ -1,7 +0,0 @@
-//+build !linux
-
-package createconfig
-
-func getHostRlimits() ([]systemUlimit, error) {
-	return nil, nil
-}