Merge pull request #4203 from opencontainers/dependabot/go_modules/gi…

…thub.com/opencontainers/runtime-spec-1.2.0

docs/spec-conformance.md

@@ -1,14 +1,15 @@
 # Spec conformance
 
-This branch of runc implements the [OCI Runtime Spec v1.1.0](https://github.com/opencontainers/runtime-spec/tree/v1.1.0)
+This branch of runc implements the [OCI Runtime Spec v1.2.0](https://github.com/opencontainers/runtime-spec/tree/v1.2.0)
 for the `linux` platform.
 
 The following features are not implemented yet:
 
-Spec version | Feature | PR
--------------|------------------------------------------|----------------------------------------------------------
-v1.1.0 | `SECCOMP_FILTER_FLAG_WAIT_KILLABLE_RECV` | [#3862](https://github.com/opencontainers/runc/pull/3862)
-v1.1.0 | `.process.ioPriority` | [#3783](https://github.com/opencontainers/runc/pull/3783)
+Spec version | Feature | PR
+-------------|------------------------------------------------|----------------------------------------------------------
+v1.1.0 | `SECCOMP_FILTER_FLAG_WAIT_KILLABLE_RECV` | [#3862](https://github.com/opencontainers/runc/pull/3862)
+v1.1.0 | `.process.ioPriority` | [#3783](https://github.com/opencontainers/runc/pull/3783)
+v1.2.0 | Features: `potentiallyUnsafeConfigAnnotations` | TODO
 
 ## Architectures
 

go.mod

@@ -13,7 +13,7 @@ require (
  github.com/moby/sys/mountinfo v0.7.1
  github.com/moby/sys/user v0.1.0
  github.com/mrunalp/fileutils v0.5.1
- github.com/opencontainers/runtime-spec v1.1.1-0.20230823135140-4fec88fd00a4
+ github.com/opencontainers/runtime-spec v1.2.0
  github.com/opencontainers/selinux v1.11.0
  github.com/seccomp/libseccomp-golang v0.10.0
  github.com/sirupsen/logrus v1.9.3

go.sum

@@ -32,8 +32,8 @@ github.com/moby/sys/user v0.1.0 h1:WmZ93f5Ux6het5iituh9x2zAG7NFY9Aqi49jjE1PaQg=
 github.com/moby/sys/user v0.1.0/go.mod h1:fKJhFOnsCN6xZ5gSfbM6zaHGgDJMrqt9/reuj4T7MmU=
 github.com/mrunalp/fileutils v0.5.1 h1:F+S7ZlNKnrwHfSwdlgNSkKo67ReVf8o9fel6C3dkm/Q=
 github.com/mrunalp/fileutils v0.5.1/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ=
-github.com/opencontainers/runtime-spec v1.1.1-0.20230823135140-4fec88fd00a4 h1:EctkgBjZ1y4q+sibyuuIgiKpa0QSd2elFtSSdNvBVow=
-github.com/opencontainers/runtime-spec v1.1.1-0.20230823135140-4fec88fd00a4/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
+github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE7dzrbT927iTk=
+github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/opencontainers/selinux v1.11.0 h1:+5Zbo97w3Lbmb3PeqQtpmTkMwsW5nRI3YaLpt7tQ7oU=
 github.com/opencontainers/selinux v1.11.0/go.mod h1:E5dMC3VPuVvVHDYmi78qvhJp8+M586T4DlDRYpFkyec=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

libcontainer/specconv/spec_linux.go

@@ -791,7 +791,7 @@ func CreateCgroupConfig(opts *CreateOpts, defaultDevs []*devices.Device) (*confi
  if r.Memory.Swap != nil {
  c.Resources.MemorySwap = *r.Memory.Swap
  }
- if r.Memory.Kernel != nil || r.Memory.KernelTCP != nil {
+ if r.Memory.Kernel != nil || r.Memory.KernelTCP != nil { //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility.
  logrus.Warn("Kernel memory settings are ignored and will be removed")
  }
  if r.Memory.Swappiness != nil {
@@ -1207,7 +1207,7 @@ func SetupSeccomp(config *specs.LinuxSeccomp) (*configs.Seccomp, error) {
 func createHooks(rspec *specs.Spec, config *configs.Config) {
  config.Hooks = configs.Hooks{}
  if rspec.Hooks != nil {
- for _, h := range rspec.Hooks.Prestart {
+ for _, h := range rspec.Hooks.Prestart { //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility.
  cmd := createCommandHook(h)
  config.Hooks[configs.Prestart] = append(config.Hooks[configs.Prestart], configs.NewCommandHook(cmd))
  }

update.go

@@ -250,7 +250,7 @@ other options are ignored.
  }{
  {"memory", r.Memory.Limit},
  {"memory-swap", r.Memory.Swap},
- {"kernel-memory", r.Memory.Kernel},
+ {"kernel-memory", r.Memory.Kernel}, //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility.
  {"kernel-memory-tcp", r.Memory.KernelTCP},
  {"memory-reservation", r.Memory.Reservation},
  } {
@@ -272,7 +272,7 @@ other options are ignored.
  r.Pids.Limit = int64(context.Int("pids-limit"))
  }
 
- if *r.Memory.Kernel != 0 || *r.Memory.KernelTCP != 0 {
+ if *r.Memory.Kernel != 0 || *r.Memory.KernelTCP != 0 { //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility.
  logrus.Warn("Kernel memory settings are ignored and will be removed")
  }
 

vendor/modules.txt

@@ -42,7 +42,7 @@ github.com/moby/sys/user
 # github.com/mrunalp/fileutils v0.5.1
 ## explicit; go 1.13
 github.com/mrunalp/fileutils
-# github.com/opencontainers/runtime-spec v1.1.1-0.20230823135140-4fec88fd00a4
+# github.com/opencontainers/runtime-spec v1.2.0
 ## explicit
 github.com/opencontainers/runtime-spec/specs-go
 github.com/opencontainers/runtime-spec/specs-go/features