From 091182fdca7a3abd27c3f77af16d14c8f53923e0 Mon Sep 17 00:00:00 2001 From: Lantao Liu Date: Mon, 29 Apr 2019 13:49:59 -0700 Subject: [PATCH 1/2] Use per-pod shim. Signed-off-by: Lantao Liu --- cluster/gce/configure.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/gce/configure.sh b/cluster/gce/configure.sh index d069dc446..081d30f59 100755 --- a/cluster/gce/configure.sh +++ b/cluster/gce/configure.sh @@ -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 From 1626663e24fb2bc74de4dae3980d43649ca2cf15 Mon Sep 17 00:00:00 2001 From: Lantao Liu Date: Mon, 29 Apr 2019 14:06:57 -0700 Subject: [PATCH 2/2] Include new go.mod file. Signed-off-by: Lantao Liu --- vendor/github.com/gogo/googleapis/go.mod | 5 +++++ vendor/github.com/gogo/protobuf/go.mod | 3 +++ vendor/github.com/sirupsen/logrus/go.mod | 10 ++++++++++ vendor/golang.org/x/sys/go.mod | 1 + vendor/gopkg.in/yaml.v2/go.mod | 5 +++++ 5 files changed, 24 insertions(+) create mode 100644 vendor/github.com/gogo/googleapis/go.mod create mode 100644 vendor/github.com/gogo/protobuf/go.mod create mode 100644 vendor/github.com/sirupsen/logrus/go.mod create mode 100644 vendor/golang.org/x/sys/go.mod create mode 100644 vendor/gopkg.in/yaml.v2/go.mod diff --git a/vendor/github.com/gogo/googleapis/go.mod b/vendor/github.com/gogo/googleapis/go.mod new file mode 100644 index 000000000..4cdef556e --- /dev/null +++ b/vendor/github.com/gogo/googleapis/go.mod @@ -0,0 +1,5 @@ +module github.com/gogo/googleapis + +go 1.12 + +require github.com/gogo/protobuf v1.2.1 diff --git a/vendor/github.com/gogo/protobuf/go.mod b/vendor/github.com/gogo/protobuf/go.mod new file mode 100644 index 000000000..6f7e29139 --- /dev/null +++ b/vendor/github.com/gogo/protobuf/go.mod @@ -0,0 +1,3 @@ +module github.com/gogo/protobuf + +require github.com/kisielk/errcheck v1.1.0 // indirect diff --git a/vendor/github.com/sirupsen/logrus/go.mod b/vendor/github.com/sirupsen/logrus/go.mod new file mode 100644 index 000000000..8261a2b3a --- /dev/null +++ b/vendor/github.com/sirupsen/logrus/go.mod @@ -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 +) diff --git a/vendor/golang.org/x/sys/go.mod b/vendor/golang.org/x/sys/go.mod new file mode 100644 index 000000000..6dfcf51e2 --- /dev/null +++ b/vendor/golang.org/x/sys/go.mod @@ -0,0 +1 @@ +module golang.org/x/sys diff --git a/vendor/gopkg.in/yaml.v2/go.mod b/vendor/gopkg.in/yaml.v2/go.mod new file mode 100644 index 000000000..1934e8769 --- /dev/null +++ b/vendor/gopkg.in/yaml.v2/go.mod @@ -0,0 +1,5 @@ +module "gopkg.in/yaml.v2" + +require ( + "gopkg.in/check.v1" v0.0.0-20161208181325-20d25e280405 +)