diff options
| author | Ian Lewis <ianmlewis@gmail.com> | 2019-04-03 02:10:26 -0400 |
|---|---|---|
| committer | Ian Lewis <ianlewis@google.com> | 2019-04-03 16:08:36 +0900 |
| commit | 95e9f1e2d83a630cb7fe280a6c971b97bb31f1b0 (patch) | |
| tree | 435701404cefcb48ae39d724eb68ca849b15efcb /content/docs | |
| parent | 9ac91e844dad36dce1a7d5fdc5abae4da561d2cc (diff) | |
Update Kubernetes doc page
- Add info on RuntimeClass
- Add section headers to clearly show content organization
Diffstat (limited to 'content/docs')
| -rw-r--r-- | content/docs/user_guide/kubernetes.md | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/content/docs/user_guide/kubernetes.md b/content/docs/user_guide/kubernetes.md index a1150622f..5e81bb873 100644 --- a/content/docs/user_guide/kubernetes.md +++ b/content/docs/user_guide/kubernetes.md @@ -2,15 +2,25 @@ title = "Kubernetes" weight = 30 +++ -gVisor can run sandboxed containers in a Kubernetes cluster with Minikube. After -the gVisor addon is enabled, pods with `io.kubernetes.cri.untrusted-workload` -set to true will execute with `runsc`. Follow [these instructions][minikube] to -enable gVisor addon. +gVisor can be used to run Kubernetes pods and has several integration points +with Kubernetes. -You can also setup Kubernetes nodes to run pods in gvisor using the `containerd` -CRI runtime and the `gvisor-containerd-shim`. Pods with the -`io.kubernetes.cri.untrusted-workload` annotation will execute with `runsc`. You -can find instructions [here][gvisor-containerd-shim]. +## Using Minikube +gVisor can run sandboxed containers in a Kubernetes cluster with Minikube. +After the gVisor addon is enabled, pods with +`io.kubernetes.cri.untrusted-workload` set to true will execute with `runsc`. +Follow [these instructions][minikube] to enable gVisor addon. + +## Using Containerd + +You can also setup Kubernetes nodes to run pods in gvisor using the +[containerd][containerd] CRI runtime and the `gvisor-containerd-shim`. You can +use either the `io.kubernetes.cri.untrusted-workload` annotation or +[RuntimeClass][runtimeclass] to run Pods with `runsc`. You can find +instructions [here][gvisor-containerd-shim]. + +[containerd]: https://containerd.io/ [minikube]: https://github.com/kubernetes/minikube/blob/master/deploy/addons/gvisor/README.md [gvisor-containerd-shim]: https://github.com/google/gvisor-containerd-shim +[runtimeclass]: https://kubernetes.io/docs/concepts/containers/runtime-class/ |