104 lines
4.8 KiB
Diff
104 lines
4.8 KiB
Diff
From c6dad73d617864f3a281ac1fdaacd5ed971fa317 Mon Sep 17 00:00:00 2001
|
|
From: Kir Kolyshkin <kolyshkin@gmail.com>
|
|
Date: Thu, 27 Jun 2024 09:00:51 -0700
|
|
Subject: [PATCH 1/2] Bump runtime-spec to latest git HEAD
|
|
|
|
This is to include
|
|
- https://github.com/opencontainers/runtime-spec/pull/1261
|
|
- https://github.com/opencontainers/runtime-spec/pull/1253
|
|
|
|
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
|
|
(cherry picked from commit 2cac22b1e29e6be4c004f35ce582aa2b7e1c2fda)
|
|
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
|
|
---
|
|
go.mod | 2 +-
|
|
go.sum | 4 ++--
|
|
.../opencontainers/runtime-spec/specs-go/config.go | 8 ++++++++
|
|
.../opencontainers/runtime-spec/specs-go/version.go | 2 +-
|
|
vendor/modules.txt | 2 +-
|
|
5 files changed, 13 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/go.mod b/go.mod
|
|
index 348bc9c6..db2d7ef1 100644
|
|
--- a/go.mod
|
|
+++ b/go.mod
|
|
@@ -19,7 +19,7 @@ require (
|
|
github.com/moby/sys/user v0.3.0
|
|
github.com/moby/sys/userns v0.1.0
|
|
github.com/mrunalp/fileutils v0.5.1
|
|
- github.com/opencontainers/runtime-spec v1.2.0
|
|
+ github.com/opencontainers/runtime-spec v1.2.1-0.20240625190033-701738418b95
|
|
github.com/opencontainers/selinux v1.11.0
|
|
github.com/seccomp/libseccomp-golang v0.10.0
|
|
github.com/sirupsen/logrus v1.9.3
|
|
diff --git a/go.sum b/go.sum
|
|
index 225d5860..4c863cc9 100644
|
|
--- a/go.sum
|
|
+++ b/go.sum
|
|
@@ -46,8 +46,8 @@ github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g
|
|
github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28=
|
|
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.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE7dzrbT927iTk=
|
|
-github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
|
|
+github.com/opencontainers/runtime-spec v1.2.1-0.20240625190033-701738418b95 h1:Ghl8Z3l+yPQUDSxAp7Kg7fJLRNNXjOsR6ooDcca7PjU=
|
|
+github.com/opencontainers/runtime-spec v1.2.1-0.20240625190033-701738418b95/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=
|
|
diff --git a/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go b/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go
|
|
index d1236ba7..671f0d01 100644
|
|
--- a/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go
|
|
+++ b/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go
|
|
@@ -94,6 +94,8 @@ type Process struct {
|
|
SelinuxLabel string `json:"selinuxLabel,omitempty" platform:"linux"`
|
|
// IOPriority contains the I/O priority settings for the cgroup.
|
|
IOPriority *LinuxIOPriority `json:"ioPriority,omitempty" platform:"linux"`
|
|
+ // ExecCPUAffinity specifies CPU affinity for exec processes.
|
|
+ ExecCPUAffinity *CPUAffinity `json:"execCPUAffinity,omitempty" platform:"linux"`
|
|
}
|
|
|
|
// LinuxCapabilities specifies the list of allowed capabilities that are kept for a process.
|
|
@@ -127,6 +129,12 @@ const (
|
|
IOPRIO_CLASS_IDLE IOPriorityClass = "IOPRIO_CLASS_IDLE"
|
|
)
|
|
|
|
+// CPUAffinity specifies process' CPU affinity.
|
|
+type CPUAffinity struct {
|
|
+ Initial string `json:"initial,omitempty"`
|
|
+ Final string `json:"final,omitempty"`
|
|
+}
|
|
+
|
|
// Box specifies dimensions of a rectangle. Used for specifying the size of a console.
|
|
type Box struct {
|
|
// Height is the vertical dimension of a box.
|
|
diff --git a/vendor/github.com/opencontainers/runtime-spec/specs-go/version.go b/vendor/github.com/opencontainers/runtime-spec/specs-go/version.go
|
|
index 503971e0..f6c15f6c 100644
|
|
--- a/vendor/github.com/opencontainers/runtime-spec/specs-go/version.go
|
|
+++ b/vendor/github.com/opencontainers/runtime-spec/specs-go/version.go
|
|
@@ -11,7 +11,7 @@ const (
|
|
VersionPatch = 0
|
|
|
|
// VersionDev indicates development branch. Releases will be empty string.
|
|
- VersionDev = ""
|
|
+ VersionDev = "+dev"
|
|
)
|
|
|
|
// Version is the specification version that the package types support.
|
|
diff --git a/vendor/modules.txt b/vendor/modules.txt
|
|
index 3b245e0d..df520923 100644
|
|
--- a/vendor/modules.txt
|
|
+++ b/vendor/modules.txt
|
|
@@ -46,7 +46,7 @@ github.com/moby/sys/userns
|
|
# github.com/mrunalp/fileutils v0.5.1
|
|
## explicit; go 1.13
|
|
github.com/mrunalp/fileutils
|
|
-# github.com/opencontainers/runtime-spec v1.2.0
|
|
+# github.com/opencontainers/runtime-spec v1.2.1-0.20240625190033-701738418b95
|
|
## explicit
|
|
github.com/opencontainers/runtime-spec/specs-go
|
|
github.com/opencontainers/runtime-spec/specs-go/features
|
|
--
|
|
2.47.1
|
|
|