Merge pull request #921 from erikwilson/bump-containerd-shim-runc-v2

pkg/agent/templates/templates.go

@@ -15,49 +15,52 @@ type ContainerdConfig struct {
 
 const ContainerdConfigTemplate = `
 [plugins.opt]
-path = "{{ .NodeConfig.Containerd.Opt }}"
+  path = "{{ .NodeConfig.Containerd.Opt }}"
 
 [plugins.cri]
-stream_server_address = "127.0.0.1"
-stream_server_port = "10010"
+  stream_server_address = "127.0.0.1"
+  stream_server_port = "10010"
 
 {{- if .IsRunningInUserNS }}
-disable_cgroup = true
-disable_apparmor = true
-restrict_oom_score_adj = true
+  disable_cgroup = true
+  disable_apparmor = true
+  restrict_oom_score_adj = true
 {{ end -}}
 
 {{- if .NodeConfig.AgentConfig.PauseImage }}
-sandbox_image = "{{ .NodeConfig.AgentConfig.PauseImage }}"
+  sandbox_image = "{{ .NodeConfig.AgentConfig.PauseImage }}"
 {{ end -}}
 
 {{- if not .NodeConfig.NoFlannel }}
-  [plugins.cri.cni]
-    bin_dir = "{{ .NodeConfig.AgentConfig.CNIBinDir }}"
-    conf_dir = "{{ .NodeConfig.AgentConfig.CNIConfDir }}"
+[plugins.cri.cni]
+  bin_dir = "{{ .NodeConfig.AgentConfig.CNIBinDir }}"
+  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}}
 {{range $k, $v := .PrivateRegistryConfig.Mirrors }}
 [plugins.cri.registry.mirrors."{{$k}}"]
-	endpoint = [{{range $i, $j := $v.Endpoints}}{{if $i}}, {{end}}{{printf "%q" .}}{{end}}]
+  endpoint = [{{range $i, $j := $v.Endpoints}}{{if $i}}, {{end}}{{printf "%q" .}}{{end}}]
 {{end}}
 
 {{range $k, $v := .PrivateRegistryConfig.Configs }}
 {{ if $v.Auth }}
 [plugins.cri.registry.configs."{{$k}}".auth]
-	{{ if $v.Auth.Username }}username = "{{ $v.Auth.Username }}"{{end}}
-	{{ if $v.Auth.Password }}password = "{{ $v.Auth.Password }}"{{end}}
-	{{ if $v.Auth.Auth }}auth = "{{ $v.Auth.Auth }}"{{end}}
-	{{ if $v.Auth.IdentityToken }}identity_token = "{{ $v.Auth.IdentityToken }}"{{end}}
+  {{ if $v.Auth.Username }}username = "{{ $v.Auth.Username }}"{{end}}
+  {{ if $v.Auth.Password }}password = "{{ $v.Auth.Password }}"{{end}}
+  {{ if $v.Auth.Auth }}auth = "{{ $v.Auth.Auth }}"{{end}}
+  {{ if $v.Auth.IdentityToken }}identity_token = "{{ $v.Auth.IdentityToken }}"{{end}}
 {{end}}
 {{ if $v.TLS }}
 [plugins.cri.registry.configs."{{$k}}".tls]
-	{{ if $v.TLS.CAFile }}ca_file = "{{ $v.TLS.CAFile }}"{{end}}
-	{{ if $v.TLS.CertFile }}cert_file = "{{ $v.TLS.CertFile }}"{{end}}
-	{{ if $v.TLS.KeyFile }}key_file = "{{ $v.TLS.KeyFile }}"{{end}}
+  {{ if $v.TLS.CAFile }}ca_file = "{{ $v.TLS.CAFile }}"{{end}}
+  {{ if $v.TLS.CertFile }}cert_file = "{{ $v.TLS.CertFile }}"{{end}}
+  {{ if $v.TLS.KeyFile }}key_file = "{{ $v.TLS.KeyFile }}"{{end}}
 {{end}}
 {{end}}
 {{end}}

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

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"

vendor/github.com/containerd/containerd/cmd/containerd-shim-runc-v1/main.go → vendor/github.com/containerd/containerd/cmd/containerd-shim-runc-v2/main.go

@@ -19,10 +19,10 @@
 package main
 
 import (
-	v1 "github.com/containerd/containerd/runtime/v2/runc/v1"
+	v2 "github.com/containerd/containerd/runtime/v2/runc/v2"
 	"github.com/containerd/containerd/runtime/v2/shim"
 )
 
 func main() {
-	shim.Run("io.containerd.runc.v1", v1.New)
+	shim.Run("io.containerd.runc.v2", v2.New)
 }

vendor/modules.txt

@@ -172,7 +172,7 @@ github.com/containerd/containerd/archive
 github.com/containerd/containerd/archive/compression
 github.com/containerd/containerd/cio
 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/containerd/containerd/cmd/containerd/command
 github.com/containerd/containerd/cmd/ctr/app
 github.com/containerd/containerd/cmd/ctr/commands
@@ -251,7 +251,7 @@ github.com/containerd/containerd/runtime/v1/shim/v1
 github.com/containerd/containerd/runtime/v2
 github.com/containerd/containerd/runtime/v2/runc
 github.com/containerd/containerd/runtime/v2/runc/options
-github.com/containerd/containerd/runtime/v2/runc/v1
+github.com/containerd/containerd/runtime/v2/runc/v2
 github.com/containerd/containerd/runtime/v2/shim
 github.com/containerd/containerd/runtime/v2/task
 github.com/containerd/containerd/services