From 83a38c2cec8a06ad7097b44bbe9ed1ed946c517e Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Wed, 12 Jul 2017 16:29:23 -0700 Subject: [PATCH] Update runtime spec to 96de01bbb42c7af89bff100e10a Signed-off-by: Michael Crosby --- .travis.yml | 2 +- vendor.conf | 4 ++-- vendor/github.com/containerd/cgroups/memory.go | 6 +++--- vendor/github.com/opencontainers/runtime-spec/README.md | 6 ------ .../opencontainers/runtime-spec/specs-go/config.go | 6 +++--- .../opencontainers/runtime-spec/specs-go/state.go | 2 +- .../opencontainers/runtime-spec/specs-go/version.go | 2 +- 7 files changed, 11 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index dd3bc17e9..ae87ca764 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,7 @@ install: - unzip -o -d /tmp/protobuf /tmp/protoc-3.1.0-linux-x86_64.zip - export PATH=$PATH:/tmp/protobuf/bin/ - go get -u github.com/vbatts/git-validation - - sudo wget https://github.com/crosbymichael/runc/releases/download/ctd-3/runc -O /bin/runc; sudo chmod +x /bin/runc + - sudo wget https://github.com/crosbymichael/runc/releases/download/ctd-4/runc -O /bin/runc; sudo chmod +x /bin/runc - wget https://github.com/xemul/criu/archive/v3.0.tar.gz -O /tmp/criu.tar.gz - tar -C /tmp/ -zxf /tmp/criu.tar.gz - cd /tmp/criu-3.0 && sudo make install-criu diff --git a/vendor.conf b/vendor.conf index cb2bfb720..b4251bdfd 100644 --- a/vendor.conf +++ b/vendor.conf @@ -1,7 +1,7 @@ github.com/coreos/go-systemd 48702e0da86bd25e76cfef347e2adeb434a0d0a6 github.com/containerd/go-runc 2774a2ea124a5c2d0aba13b5c2dd8a5a9a48775d github.com/containerd/console 7fed77e673ca4abcd0cbd6d4d0e0e22137cbd778 -github.com/containerd/cgroups fe1947308d8f3fc3a7ef8996ba1da7b82de4e053 +github.com/containerd/cgroups 4fd64a776f25b5540cddcb72eea6e35e58baca6e github.com/docker/go-metrics 8fd5772bf1584597834c6f7961a530f06cbfbb87 github.com/docker/go-events aa2e3b613fbbfdddbe055a7b9e3ce271cfd83eca github.com/godbus/dbus c7fdd8b5cd55e87b4e1f4e372cdb1db61dd6c66f @@ -14,7 +14,7 @@ github.com/matttproud/golang_protobuf_extensions v1.0.0 github.com/docker/go-units v0.3.1 github.com/gogo/protobuf d2e1ade2d719b78fe5b061b4c18a9f7111b5bdc8 github.com/golang/protobuf 5a0f697c9ed9d68fef0116532c6e05cfeae00e55 -github.com/opencontainers/runtime-spec v1.0.0-rc6 +github.com/opencontainers/runtime-spec 96de01bbb42c7af89bff100e10a9f0fb62e75bfb github.com/opencontainers/runc 429a5387123625040bacfbb60d96b1cbd02293ab github.com/Sirupsen/logrus v0.11.0 github.com/containerd/btrfs e9c546f46bccffefe71a6bc137e4c21b5503cc18 diff --git a/vendor/github.com/containerd/cgroups/memory.go b/vendor/github.com/containerd/cgroups/memory.go index 45c87962c..9e2ddf2e4 100644 --- a/vendor/github.com/containerd/cgroups/memory.go +++ b/vendor/github.com/containerd/cgroups/memory.go @@ -274,7 +274,7 @@ func getMemorySettings(resources *specs.LinuxResources) []memorySettings { }, { name: "oom_control", - value: getOomControlValue(resources), + value: getOomControlValue(mem), }, { name: "swappiness", @@ -295,8 +295,8 @@ func checkEBUSY(err error) error { return err } -func getOomControlValue(resources *specs.LinuxResources) *int64 { - if resources.DisableOOMKiller != nil && *resources.DisableOOMKiller { +func getOomControlValue(mem *specs.LinuxMemory) *int64 { + if mem.DisableOOMKiller != nil && *mem.DisableOOMKiller { i := int64(1) return &i } diff --git a/vendor/github.com/opencontainers/runtime-spec/README.md b/vendor/github.com/opencontainers/runtime-spec/README.md index c2b355c33..2f7eb6086 100644 --- a/vendor/github.com/opencontainers/runtime-spec/README.md +++ b/vendor/github.com/opencontainers/runtime-spec/README.md @@ -10,7 +10,6 @@ Additional documentation about how this group operates: - [Code of Conduct][code-of-conduct] - [Style and Conventions](style.md) -- [Roadmap](ROADMAP.md) - [Implementations](implementations.md) - [Releases](RELEASES.md) - [project](project.md) @@ -35,11 +34,6 @@ Example use cases include sophisticated network configuration, volume garbage co Runtime developers can build runtime implementations that run OCI-compliant bundles and container configuration, containing low-level OS and host-specific details, on a particular platform. -## Releases - -There is a loose [Road Map](./ROADMAP.md). -During the `0.x` series of OCI releases we make no backwards compatibility guarantees and intend to break the schema during this series. - ## Contributing Development happens on GitHub for the spec. 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 c00f96ebc..f3f37d42d 100644 --- a/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go +++ b/vendor/github.com/opencontainers/runtime-spec/specs-go/config.go @@ -284,6 +284,8 @@ type LinuxMemory struct { KernelTCP *int64 `json:"kernelTCP,omitempty"` // How aggressive the kernel will swap memory pages. Swappiness *uint64 `json:"swappiness,omitempty"` + // DisableOOMKiller disables the OOM killer for out of memory conditions + DisableOOMKiller *bool `json:"disableOOMKiller,omitempty"` } // LinuxCPU for Linux cgroup 'cpu' resource management @@ -322,8 +324,6 @@ type LinuxNetwork struct { type LinuxResources struct { // Devices configures the device whitelist. Devices []LinuxDeviceCgroup `json:"devices,omitempty"` - // DisableOOMKiller disables the OOM killer for out of memory conditions - DisableOOMKiller *bool `json:"disableOOMKiller,omitempty"` // Memory restriction configuration Memory *LinuxMemory `json:"memory,omitempty"` // CPU resource restriction configuration @@ -550,7 +550,7 @@ const ( type LinuxSeccompArg struct { Index uint `json:"index"` Value uint64 `json:"value"` - ValueTwo uint64 `json:"valueTwo,omiempty"` + ValueTwo uint64 `json:"valueTwo,omitempty"` Op LinuxSeccompOperator `json:"op"` } diff --git a/vendor/github.com/opencontainers/runtime-spec/specs-go/state.go b/vendor/github.com/opencontainers/runtime-spec/specs-go/state.go index b5dd3bee8..89dce34be 100644 --- a/vendor/github.com/opencontainers/runtime-spec/specs-go/state.go +++ b/vendor/github.com/opencontainers/runtime-spec/specs-go/state.go @@ -9,7 +9,7 @@ type State struct { // Status is the runtime status of the container. Status string `json:"status"` // Pid is the process ID for the container process. - Pid int `json:"pid"` + Pid int `json:"pid,omitempty"` // Bundle is the path to the container's bundle directory. Bundle string `json:"bundle"` // Annotations are key values associated with the container. 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 4804b80fc..57594b5cb 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 = "-rc6" + VersionDev = "-rc6-dev" ) // Version is the specification version that the package types support.