From 90df4a19212482b7a92f3ee6eb42017f2994f7cf Mon Sep 17 00:00:00 2001
From: Erik Wilson <Erik.E.Wilson@gmail.com>
Date: Fri, 18 Oct 2019 12:29:41 -0700
Subject: [PATCH] Use containerd-shim-run-v2

---
 pkg/agent/templates/templates.go | 3 +++
 scripts/build                    | 7 ++++---
 vendor.go                        | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkg/agent/templates/templates.go b/pkg/agent/templates/templates.go
index b7c2f6a2e4..b082d46d1d 100644
--- a/pkg/agent/templates/templates.go
+++ b/pkg/agent/templates/templates.go
@@ -37,6 +37,9 @@ sandbox_image = "{{ .NodeConfig.AgentConfig.PauseImage }}"
     conf_dir = "{{ .NodeConfig.AgentConfig.CNIConfDir }}"
 {{ end -}}
 
+[plugins.cri.containerd.runtimes.runc]
+  runtime_type = "io.containerd.runc.v2"
+
 {{ if .PrivateRegistryConfig }}
 {{ if .PrivateRegistryConfig.Mirrors }}
 [plugins.cri.registry.mirrors]{{end}}
diff --git a/scripts/build b/scripts/build
index 3b08b03ed9..26b72060a2 100755
--- a/scripts/build
+++ b/scripts/build
@@ -48,6 +48,7 @@ rm -f \
     bin/runc \
     bin/containerd-shim \
     bin/containerd-shim-runc-v1 \
+    bin/containerd-shim-runc-v2 \
     bin/k3s-server \
     bin/kubectl \
     bin/crictl \
@@ -92,6 +93,6 @@ echo Building containerd-shim
 make -C ./vendor/github.com/containerd/containerd bin/containerd-shim
 cp -f ./vendor/github.com/containerd/containerd/bin/containerd-shim ./bin/containerd-shim
 
-echo Building containerd-shim-runc-v1
-make -C ./vendor/github.com/containerd/containerd bin/containerd-shim-runc-v1
-cp -f ./vendor/github.com/containerd/containerd/bin/containerd-shim-runc-v1 ./bin/containerd-shim-runc-v1
+echo Building containerd-shim-runc-v2
+make -C ./vendor/github.com/containerd/containerd bin/containerd-shim-runc-v2
+cp -f ./vendor/github.com/containerd/containerd/bin/containerd-shim-runc-v2 ./bin/containerd-shim-runc-v2
diff --git a/vendor.go b/vendor.go
index 15503d6c0d..1131d5063d 100644
--- a/vendor.go
+++ b/vendor.go
@@ -4,7 +4,7 @@ package main
 
 import (
 	_ "github.com/containerd/containerd/cmd/containerd-shim"
-	_ "github.com/containerd/containerd/cmd/containerd-shim-runc-v1"
+	_ "github.com/containerd/containerd/cmd/containerd-shim-runc-v2"
 	_ "github.com/coreos/go-systemd/activation"
 	_ "github.com/go-bindata/go-bindata"
 	_ "github.com/go-bindata/go-bindata/go-bindata"