Merge pull request #1137 from Random-Liu/per-pod-shim

Use per-pod shim.
containerd · Apr 29, 2019 · 82ff937 · 82ff937
2 parents 2fc62db + 1626663
commit 82ff937
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 1 deletion.
diff --git 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

diff --git a/vendor/github.com/gogo/googleapis/go.mod b/vendor/github.com/gogo/googleapis/go.mod
diff --git a/vendor/github.com/gogo/protobuf/go.mod b/vendor/github.com/gogo/protobuf/go.mod
diff --git a/vendor/github.com/sirupsen/logrus/go.mod b/vendor/github.com/sirupsen/logrus/go.mod
diff --git a/vendor/golang.org/x/sys/go.mod b/vendor/golang.org/x/sys/go.mod
diff --git a/vendor/gopkg.in/yaml.v2/go.mod b/vendor/gopkg.in/yaml.v2/go.mod