Merge pull request #1137 from Random-Liu/per-pod-shim
Use per-pod shim.
This commit is contained in:
commit
82ff9372ad
@ -179,7 +179,7 @@ disabled_plugins = ["restart"]
|
||||
[plugins.cri.containerd]
|
||||
default_runtime_name = "${CONTAINERD_DEFAULT_RUNTIME:-"runc"}"
|
||||
[plugins.cri.containerd.runtimes.runc]
|
||||
runtime_type = "io.containerd.runc.v1"
|
||||
runtime_type = "io.containerd.runc.v2"
|
||||
[plugins.cri.containerd.runtimes.runc.options]
|
||||
BinaryName = "${CONTAINERD_HOME}/usr/local/sbin/runc"
|
||||
EOF
|
||||
|
5
vendor/github.com/gogo/googleapis/go.mod
generated
vendored
Normal file
5
vendor/github.com/gogo/googleapis/go.mod
generated
vendored
Normal file
@ -0,0 +1,5 @@
|
||||
module github.com/gogo/googleapis
|
||||
|
||||
go 1.12
|
||||
|
||||
require github.com/gogo/protobuf v1.2.1
|
3
vendor/github.com/gogo/protobuf/go.mod
generated
vendored
Normal file
3
vendor/github.com/gogo/protobuf/go.mod
generated
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
module github.com/gogo/protobuf
|
||||
|
||||
require github.com/kisielk/errcheck v1.1.0 // indirect
|
10
vendor/github.com/sirupsen/logrus/go.mod
generated
vendored
Normal file
10
vendor/github.com/sirupsen/logrus/go.mod
generated
vendored
Normal file
@ -0,0 +1,10 @@
|
||||
module github.com/sirupsen/logrus
|
||||
|
||||
require (
|
||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||
github.com/konsorten/go-windows-terminal-sequences v1.0.1
|
||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||
github.com/stretchr/objx v0.1.1 // indirect
|
||||
github.com/stretchr/testify v1.2.2
|
||||
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33
|
||||
)
|
1
vendor/golang.org/x/sys/go.mod
generated
vendored
Normal file
1
vendor/golang.org/x/sys/go.mod
generated
vendored
Normal file
@ -0,0 +1 @@
|
||||
module golang.org/x/sys
|
5
vendor/gopkg.in/yaml.v2/go.mod
generated
vendored
Normal file
5
vendor/gopkg.in/yaml.v2/go.mod
generated
vendored
Normal file
@ -0,0 +1,5 @@
|
||||
module "gopkg.in/yaml.v2"
|
||||
|
||||
require (
|
||||
"gopkg.in/check.v1" v0.0.0-20161208181325-20d25e280405
|
||||
)
|
Loading…
Reference in New Issue
Block a user