api,runtime-tools: adjust for runtime-spec v1.3.0.

Signed-off-by: Krisztian Litkey <krisztian.litkey@intel.com>

Author: klihub

pkg/api/hooks.go

@@ -25,7 +25,7 @@ func (hooks *Hooks) Append(h *Hooks) *Hooks {
 	if h == nil {
 		return hooks
 	}
-	hooks.Prestart = append(hooks.Prestart, h.Prestart...)
+	hooks.Prestart = append(hooks.Prestart, h.Prestart...) //nolint:staticcheck // ignore SA1019: o.Prestart is deprecated
 	hooks.CreateRuntime = append(hooks.CreateRuntime, h.CreateRuntime...)
 	hooks.CreateContainer = append(hooks.CreateContainer, h.CreateContainer...)
 	hooks.StartContainer = append(hooks.StartContainer, h.StartContainer...)
@@ -79,7 +79,7 @@ func FromOCIHooks(o *rspec.Hooks) *Hooks {
 		return nil
 	}
 	return &Hooks{
-		Prestart:        FromOCIHookSlice(o.Prestart),
+		Prestart:        FromOCIHookSlice(o.Prestart), //nolint:staticcheck // ignore SA1019: o.Prestart is deprecated
 		CreateRuntime:   FromOCIHookSlice(o.CreateRuntime),
 		CreateContainer: FromOCIHookSlice(o.CreateContainer),
 		StartContainer:  FromOCIHookSlice(o.StartContainer),

pkg/api/resources.go

@@ -22,6 +22,11 @@ import (
 	rspec "github.com/opencontainers/runtime-spec/specs-go"
 )
 
+const (
+	// UnlimitedPidsLimit indicates unlimited Linux PIDs limit.
+	UnlimitedPidsLimit = -1
+)
+
 // FromOCILinuxResources returns resources from an OCI runtime Spec.
 func FromOCILinuxResources(o *rspec.LinuxResources, _ map[string]string) *LinuxResources {
 	if o == nil {
@@ -33,7 +38,7 @@ func FromOCILinuxResources(o *rspec.LinuxResources, _ map[string]string) *LinuxR
 			Limit:            Int64(m.Limit),
 			Reservation:      Int64(m.Reservation),
 			Swap:             Int64(m.Swap),
-			Kernel:           Int64(m.Kernel),
+			Kernel:           Int64(m.Kernel), //nolint:staticcheck // ignore SA1019: m.Kernel is deprecated
 			KernelTcp:        Int64(m.KernelTCP),
 			Swappiness:       UInt64(m.Swappiness),
 			DisableOomKiller: Bool(m.DisableOOMKiller),
@@ -67,8 +72,9 @@ func FromOCILinuxResources(o *rspec.LinuxResources, _ map[string]string) *LinuxR
 		})
 	}
 	if p := o.Pids; p != nil {
-		l.Pids = &LinuxPids{
-			Limit: p.Limit,
+		l.Pids = &LinuxPids{}
+		if p.Limit != nil && *p.Limit != 0 {
+			l.Pids.Limit = *p.Limit
 		}
 	}
 	if len(o.Unified) != 0 {
@@ -134,8 +140,10 @@ func (r *LinuxResources) ToOCI() *rspec.LinuxResources {
 		})
 	}
 	if r.Pids != nil {
-		o.Pids = &rspec.LinuxPids{
-			Limit: r.Pids.Limit,
+		o.Pids = &rspec.LinuxPids{}
+		if r.Pids.Limit > UnlimitedPidsLimit {
+			limit := r.Pids.Limit
+			o.Pids.Limit = &limit
 		}
 	}
 	return o

pkg/runtime-tools/generate/generate.go

@@ -29,6 +29,11 @@ import (
 	nri "github.com/containerd/nri/pkg/api"
 )
 
+const (
+	// UnlimitedPidsLimit indicates unlimited Linux PIDs limit.
+	UnlimitedPidsLimit = -1
+)
+
 // GeneratorOption is an option for Generator().
 type GeneratorOption func(*Generator)
 
@@ -611,6 +616,21 @@ func (g *Generator) SetProcessIOPriority(ioprio *rspec.LinuxIOPriority) {
 	g.Config.Process.IOPriority = ioprio
 }
 
+// SetLinuxResourcesPidsLimit sets Linux PID limit. Starting with
+// v1.3.0 opencontainers/runtime-spec switched the PID limit to
+// *int64 from int64 with nil meaning "unlimited". We don't want
+// to change our API types though, so instead we use a dedicated
+// value for unlimited.
+func (g *Generator) SetLinuxResourcesPidsLimit(limit int64) {
+	g.initConfigLinuxResources()
+	if g.Config.Linux.Resources.Pids == nil {
+		g.Config.Linux.Resources.Pids = &rspec.LinuxPids{}
+	}
+	if limit > UnlimitedPidsLimit {
+		g.Config.Linux.Resources.Pids.Limit = &limit
+	}
+}
+
 func (g *Generator) initConfig() {
 	if g.Config == nil {
 		g.Config = &rspec.Spec{}

pkg/runtime-tools/generate/generate_suite_test.go

@@ -565,7 +565,7 @@ func withPidsLimit(v int64) specOption {
 			spec.Linux.Resources = &rspec.LinuxResources{}
 		}
 		spec.Linux.Resources.Pids = &rspec.LinuxPids{
-			Limit: v,
+			Limit: &v,
 		}
 	}
 }
@@ -605,7 +605,7 @@ func makeSpec(options ...specOption) *rspec.Spec {
 					Mems:   "0-4",
 				},
 				Pids: &rspec.LinuxPids{
-					Limit: 1,
+					Limit: func(v int64) *int64 { return &v }(1),
 				},
 			},
 		},