summaryrefslogtreecommitdiffhomepage
path: root/g3doc/user_guide
diff options
context:
space:
mode:
Diffstat (limited to 'g3doc/user_guide')
-rw-r--r--g3doc/user_guide/FAQ.md2
-rw-r--r--g3doc/user_guide/containerd/quick_start.md3
2 files changed, 4 insertions, 1 deletions
diff --git a/g3doc/user_guide/FAQ.md b/g3doc/user_guide/FAQ.md
index 514fe3918..69033357c 100644
--- a/g3doc/user_guide/FAQ.md
+++ b/g3doc/user_guide/FAQ.md
@@ -111,7 +111,7 @@ Please recreate your cluster and set the `--cni-socket` option on kubeadm
commands. For example:
```bash
-kubeadm init --cni-socket=/var/run/containerd/containerd.sock` ...
+kubeadm init --cni-socket=/var/run/containerd/containerd.sock ...
```
To fix an existing cluster edit the `/var/lib/kubelet/kubeadm-flags.env` file
diff --git a/g3doc/user_guide/containerd/quick_start.md b/g3doc/user_guide/containerd/quick_start.md
index 2f67eecb3..b6a3186d8 100644
--- a/g3doc/user_guide/containerd/quick_start.md
+++ b/g3doc/user_guide/containerd/quick_start.md
@@ -3,6 +3,9 @@
This document describes how to install and configure `containerd-shim-runsc-v1`
using the containerd runtime handler support on `containerd` 1.2 or later.
+> ⚠️ NOTE: If you are using Kubernetes and set up your cluster using kubeadm you
+> may run into issues. See the [FAQ](../FAQ.md#runtime-handler) for details.
+
## Requirements
- **runsc** and **containerd-shim-runsc-v1**: See the