[release/1.6] fix remaining "v1 config" plugin IDs

thaJeztah · thaJeztah · commit 5b51b79e2c7b · 2023-07-14T12:02:49.000+02:00
These are no longer included on the main branch, so were not
part of other cherry-picks.

Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/docs/man/containerd-config.toml.5.md b/docs/man/containerd-config.toml.5.md
@@ -87,7 +87,7 @@ documentation.
 
 - **[plugins."io.containerd.monitor.v1.cgroups"]** has one option __no_prometheus__ (Default: **false**)
 - **[plugins."io.containerd.service.v1.diff-service"]** has one option __default__, a list by default set to **["walking"]**
-- **[plugins.linux]** has several options for configuring the runtime, shim, and related options:
+- **[plugins."io.containerd.runtime.v1.linux"]** has several options for configuring the runtime, shim, and related options:
   - **shim** specifies the shim binary (Default: **"containerd-shim"**),
   - **runtime** is the OCI compliant runtime binary (Default: **"runc"**),
   - **runtime_root** is the root directory used by the runtime (Default: **""**),
@@ -186,7 +186,7 @@ imports = ["/etc/containerd/runtime_*.toml", "./debug.toml"]
     no_prometheus = false
   [plugins."io.containerd.service.v1.diff-service"]
     default = ["walking"]
-  [plugins.linux]
+  [plugins."io.containerd.runtime.v1.linux"]
     shim = "containerd-shim"
     runtime = "runc"
     runtime_root = ""
diff --git a/docs/ops.md b/docs/ops.md
@@ -205,7 +205,9 @@ See [containerd's Plugin documentation](./PLUGINS.md)
 The linux runtime allows a few options to be set to configure the shim and the runtime that you are using.
 
 ```toml
-[plugins.linux]
+version = 2
+
+[plugins."io.containerd.runtime.v1.linux"]
 	# shim binary name/path
 	shim = ""
 	# runtime binary name/path
