Skip to content

Commit aa0f4fd

Browse files
mikebrowmikebrow
authored
Merge pull request #1521 from AkihiroSuda/revendor-libcontainer
vendor runc v1.0.0-rc91
2 parents 1bc5ba3 + fb208d0 commit aa0f4fd

155 files changed

Lines changed: 8754 additions & 5650 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pkg/containerd/opts/spec_unix.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ func WithDevices(osi osinterface.OS, config *runtime.ContainerConfig) oci.SpecOp
324324
Type: string(dev.Type),
325325
Major: &dev.Major,
326326
Minor: &dev.Minor,
327-
Access: dev.Permissions,
327+
Access: string(dev.Permissions),
328328
})
329329
}
330330
return nil

‎pkg/server/container_create_unix_test.go‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333
"github.com/containerd/containerd/mount"
3434
"github.com/containerd/containerd/oci"
3535
imagespec "github.com/opencontainers/image-spec/specs-go/v1"
36+
libcontainerconfigs "github.com/opencontainers/runc/libcontainer/configs"
3637
"github.com/opencontainers/runc/libcontainer/devices"
3738
runtimespec "github.com/opencontainers/runtime-spec/specs-go"
3839
"github.com/opencontainers/selinux/go-selinux"
@@ -1193,8 +1194,15 @@ func TestPrivilegedDevices(t *testing.T) {
11931194
spec, err := c.containerSpec(t.Name(), testSandboxID, testPid, "", testContainerName, containerConfig, sandboxConfig, imageConfig, nil, ociRuntime)
11941195
assert.NoError(t, err)
11951196

1196-
hostDevices, err := devices.HostDevices()
1197+
hostDevicesRaw, err := devices.HostDevices()
11971198
assert.NoError(t, err)
1199+
var hostDevices []*libcontainerconfigs.Device
1200+
for _, dev := range hostDevicesRaw {
1201+
// https://github.com/containerd/cri/pull/1521#issuecomment-652807951
1202+
if dev.DeviceRule.Major != 0 {
1203+
hostDevices = append(hostDevices, dev)
1204+
}
1205+
}
11981206

11991207
if test.expectHostDevices {
12001208
assert.Len(t, spec.Linux.Devices, len(hostDevices))

‎vendor.conf‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# cri dependencies
22
github.com/docker/docker 4634ce647cf2ce2c6031129ccd109e557244986f
3-
github.com/opencontainers/selinux bb88c45a3863dc4c38320d71b890bb30ef9feba4
3+
github.com/opencontainers/selinux v1.5.1
44
github.com/tchap/go-patricia v2.2.6
55

66
# containerd dependencies
77
github.com/beorn7/perks v1.0.1
88
github.com/BurntSushi/toml v0.3.1
99
github.com/cespare/xxhash/v2 v2.1.1
10-
github.com/containerd/cgroups b4448137398923af7f4918b8b2ad8249172ca7a6
10+
github.com/containerd/cgroups e9676da73eddf8ed2433f77aaf3b9cf8f0f75b8c
1111
github.com/containerd/console v1.0.0
1212
github.com/containerd/containerd v1.4.0-beta.0
1313
github.com/containerd/continuity d3ef23f19fbb106bb73ffde425d07a9187e30745
@@ -16,14 +16,14 @@ github.com/containerd/go-runc 7016d3ce2328dd2cb1192b2076eb
1616
github.com/containerd/ttrpc v1.0.1
1717
github.com/containerd/typeurl v1.0.1
1818
github.com/coreos/go-systemd/v22 v22.0.0
19-
github.com/cpuguy83/go-md2man v1.0.10
19+
github.com/cpuguy83/go-md2man/v2 v2.0.0
2020
github.com/docker/go-events e31b211e4f1cd09aa76fe4ac244571fab96ae47f
2121
github.com/docker/go-metrics v0.0.1
2222
github.com/docker/go-units v0.4.0
2323
github.com/godbus/dbus/v5 v5.0.3
2424
github.com/gogo/googleapis v1.3.2
2525
github.com/gogo/protobuf v1.3.1
26-
github.com/golang/protobuf v1.3.3
26+
github.com/golang/protobuf v1.3.5
2727
github.com/google/uuid v1.1.1
2828
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
2929
github.com/hashicorp/errwrap v1.0.0
@@ -36,28 +36,29 @@ github.com/Microsoft/go-winio v0.4.14
3636
github.com/Microsoft/hcsshim v0.8.9
3737
github.com/opencontainers/go-digest v1.0.0
3838
github.com/opencontainers/image-spec v1.0.1
39-
github.com/opencontainers/runc v1.0.0-rc10
40-
github.com/opencontainers/runtime-spec v1.0.2
39+
github.com/opencontainers/runc v1.0.0-rc91
40+
github.com/opencontainers/runtime-spec 237cc4f519e2e8f9b235bacccfa8ef5a84df2875 # v1.0.2-14-g8e2f17c
4141
github.com/pkg/errors v0.9.1
4242
github.com/prometheus/client_golang v1.6.0
4343
github.com/prometheus/client_model v0.2.0
4444
github.com/prometheus/common v0.9.1
4545
github.com/prometheus/procfs v0.0.11
46-
github.com/russross/blackfriday v1.5.2
46+
github.com/russross/blackfriday/v2 v2.0.1
47+
github.com/shurcooL/sanitized_anchor_name v1.0.0
4748
github.com/sirupsen/logrus v1.6.0
4849
github.com/syndtr/gocapability d98352740cb2c55f81556b63d4a1ec64c5a319c2
49-
github.com/urfave/cli v1.22.0
50+
github.com/urfave/cli v1.22.1 # NOTE: urfave/cli must be <= v1.22.1 due to a regression: https://github.com/urfave/cli/issues/1092
5051
go.etcd.io/bbolt v1.3.3
5152
go.opencensus.io v0.22.0
5253
golang.org/x/net f3200d17e092c607f615320ecaad13d87ad9a2b3
5354
golang.org/x/sync 42b317875d0fa942474b76e1b46a6060d720ae6e
54-
golang.org/x/sys 5c8b2ff67527cb88b770f693cebf3799036d8bc0
55+
golang.org/x/sys 9dae0f8f577553e0f21298e18926efc9644c281d
5556
golang.org/x/text 19e51611da83d6be54ddafce4a4af510cb3e9ea4
5657
google.golang.org/genproto e50cd9704f63023d62cd06a1994b98227fc4d21a
5758
google.golang.org/grpc v1.27.1
5859

5960
# cgroups dependencies
60-
github.com/cilium/ebpf 4032b1d8aae306b7bb94a2a11002932caf88c644
61+
github.com/cilium/ebpf 1c8d4c9ef7759622653a1d319284a44652333b28
6162

6263
# kubernetes dependencies
6364
github.com/davecgh/go-spew v1.1.1

‎vendor/github.com/cilium/ebpf/abi.go‎

Lines changed: 9 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/cilium/ebpf/asm/instruction.go‎

Lines changed: 87 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)