fixup! app-containers/containerd: use default config

* Migrate the config to version 3
* Drop the 'io.containerd.runtime.v1.linux' as it's not available in
  containerd 2.x

Author: tormath1

sdk_container/src/third_party/coreos-overlay/coreos/sysext/containerd/usr/share/containerd/config.toml

@@ -1,13 +1,15 @@
 # containerd default config
 
 version = 3
+
+imports = ['/usr/share/containerd/flatcar-config.toml', '/etc/containerd/conf.d/*.toml']
+
 root = '/var/lib/containerd'
 state = '/run/containerd'
 temp = ''
 disabled_plugins = []
 required_plugins = []
 oom_score = 0
-imports = ['/usr/share/containerd/flatcar-config.toml', '/etc/containerd/conf.d/*.toml']
 
 [grpc]
   address = '/run/containerd/containerd.sock'
@@ -184,9 +186,6 @@ imports = ['/usr/share/containerd/flatcar-config.toml', '/etc/containerd/conf.d/
       required_plugins = []
       tolerate_missing_plugins_annotation = ''
 
-  [plugins.'io.containerd.runtime.v2.task']
-    platforms = ['linux/amd64']
-
   [plugins.'io.containerd.service.v1.diff-service']
     default = ['walking']
     sync_fs = false

sdk_container/src/third_party/coreos-overlay/coreos/sysext/containerd/usr/share/containerd/flatcar-config.toml

@@ -1,25 +1,16 @@
-version = 2
-# set containerd as a subreaper on linux when it is not running as PID 1
-subreaper = true
+version = 3
 # set containerd's OOM score
 oom_score = -999
 disabled_plugins = []
 
-[plugins."io.containerd.runtime.v1.linux"]
-# shim binary name/path
-shim = "containerd-shim"
-# runtime binary name/path
-runtime = "runc"
-# do not use a shim when starting containers, saves on memory but
-# live restore is not supported
-no_shim = false
-
-[plugins."io.containerd.grpc.v1.cri"]
+[plugins."io.containerd.cri.v1.runtime"]
 # enable SELinux labeling
 enable_selinux = true
 
-[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
+[plugins."io.containerd.cri.v1.runtime".containerd.runtimes.runc]
 # setting runc.options unsets parent settings
 runtime_type = "io.containerd.runc.v2"
-[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+
+[plugins."io.containerd.cri.v1.runtime".containerd.runtimes.runc.options]
 SystemdCgroup = true
+