Merge pull request firecracker-microvm#534 from Kern--/config-v2

Use config version 2

Author: Kern--

.buildkite/setup_al2.sh

@@ -21,13 +21,14 @@ sudo -E INSTALLROOT=$INSTALLROOT PATH=$PATH \
      make install install-firecracker install-default-rootfs
 
 cat << EOF > $dir/config.toml
-disabled_plugins = ["cri"]
+version = 2
+disabled_plugins = ["io.containerd.grpc.v1.cri"]
 root = "$dir"
 state = "$state_path"
 [grpc]
   address = "$dir/containerd.sock"
 [plugins]
-  [plugins.devmapper]
+  [plugins."io.containerd.snapshotter.v1.devmapper"]
     pool_name = "fcci--vg-$unique_id"
     base_image_size = "10GB"
     root_path = "$devmapper_path"

docs/getting-started.md

@@ -128,13 +128,14 @@ snapshotter you intend to use.
 We recommend a configuration like the following:
 
 ```toml
-disabled_plugins = ["cri"]
+version = 2
+disabled_plugins = ["io.containerd.grpc.v1.cri"]
 root = "/var/lib/firecracker-containerd/containerd"
 state = "/run/firecracker-containerd"
 [grpc]
   address = "/run/firecracker-containerd/containerd.sock"
 [plugins]
-  [plugins.devmapper]
+  [plugins."io.containerd.snapshotter.v1.devmapper"]
     pool_name = "fc-dev-thinpool"
     base_image_size = "10GB"
     root_path = "/var/lib/firecracker-containerd/snapshotter/devmapper"

docs/quickstart.md

@@ -137,13 +137,14 @@ sudo mkdir -p /var/lib/firecracker-containerd/containerd
 # shim from
 sudo mkdir -p /var/lib/firecracker-containerd
 sudo tee /etc/firecracker-containerd/config.toml <<EOF
-disabled_plugins = ["cri"]
+version = 2
+disabled_plugins = ["io.containerd.grpc.v1.cri"]
 root = "/var/lib/firecracker-containerd/containerd"
 state = "/run/firecracker-containerd"
 [grpc]
   address = "/run/firecracker-containerd/containerd.sock"
 [plugins]
-  [plugins.devmapper]
+  [plugins."io.containerd.snapshotter.v1.devmapper"]
     pool_name = "fc-dev-thinpool"
     base_image_size = "10GB"
     root_path = "/var/lib/firecracker-containerd/snapshotter/devmapper"

tools/docker/entrypoint.sh

@@ -12,8 +12,9 @@ else
 fi
 
 cat > /etc/containerd/snapshotter/devmapper.toml <<EOF
+version = 2
 [plugins]
-  [plugins.devmapper]
+  [plugins."io.containerd.snapshotter.v1.devmapper"]
     pool_name = "${pool_name}"
     base_image_size = "1024MB"
 EOF