Skip to content

Commit 8fe6cf5

Browse files
estespestesp
authored
Merge pull request #4497 from dmcgowan/update-cri-nri
Update CRI
2 parents 5c73fe0 + ac95f27 commit 8fe6cf5

12 files changed

Lines changed: 777 additions & 14 deletions

File tree

‎vendor.conf‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ github.com/containerd/console v1.0.0
77
github.com/containerd/continuity efbc4488d8fe1bdc16bde3b2d2990d9b3a899165
88
github.com/containerd/fifo f15a3290365b9d2627d189e619ab4008e0069caf
99
github.com/containerd/go-runc 7016d3ce2328dd2cb1192b2076ebd565c4e8df0c
10+
github.com/containerd/nri 0afc7f031eaf9c7d9c1a381b7ab5462e89c998fc
1011
github.com/containerd/ttrpc v1.0.1
1112
github.com/containerd/typeurl v1.0.1
1213
github.com/coreos/go-systemd/v22 v22.1.0
@@ -57,7 +58,7 @@ gotest.tools/v3 v3.0.2
5758
github.com/cilium/ebpf 1c8d4c9ef7759622653a1d319284a44652333b28
5859

5960
# cri dependencies
60-
github.com/containerd/cri 4e6644c8cf7fb825f62e0007421b7d83dfeab5a1 # master
61+
github.com/containerd/cri 56a89cda34644fedf0c99f96c888de5851e0e406 # master
6162
github.com/davecgh/go-spew v1.1.1
6263
github.com/docker/docker 4634ce647cf2ce2c6031129ccd109e557244986f
6364
github.com/docker/spdystream 449fdfce4d962303d702fec724ef0ad181c92528

‎vendor/github.com/containerd/cri/README.md‎

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

‎vendor/github.com/containerd/cri/pkg/server/container_start.go‎

Lines changed: 15 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/cri/pkg/server/events.go‎

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

‎vendor/github.com/containerd/cri/pkg/server/opts.go‎

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

‎vendor/github.com/containerd/cri/pkg/server/sandbox_run.go‎

Lines changed: 17 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/cri/vendor.conf‎

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

0 commit comments

Comments
 (0)