You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Went through and made a few grammar and format updates to make how-to guide
easier to follow, as well as adddirect links to project Github pages where applicable.
Fixes: kata-containers#127
Signed-off-by: trilliams <[email protected]>
howto: k8s grammar and format changes
Went through and made a few grammar and format updates to make how-to guide
easier to follow, as well as adddirect links to project Github pages where applicable.
Fixes: kata-containers#127
Signed-off-by: trilliams <[email protected]>
Copy file name to clipboardExpand all lines: how-to/how-to-use-k8s-with-cri-containerd-and-kata.md
+210-21
Original file line number
Diff line number
Diff line change
@@ -1,65 +1,133 @@
1
1
# How to use Kata Containers and CRI (containerd plugin) with Kubernetes
2
2
3
+
<<<<<<< HEAD
3
4
This document describes how to set up a single-machine Kubernetes cluster.
5
+
<<<<<<< HEAD
6
+
<<<<<<< HEAD
4
7
The Kubernetes cluster will use the CRI containerd plugin and Kata Containers to launch untrusted workloads.
8
+
=======
9
+
The Kubernetes cluster will use the [CRI containerd plugin](https://github.com/containerd/cri) and [Kata Containers](https://katacontainers.io) to launch untrusted workloads.
10
+
>>>>>>> c22d45e... made a few grammatical & format changes
5
11
6
12
## Requirements
13
+
=======
14
+
The Kubernetes cluster will use the [CRI containerd plugin](https://github.com/containerd/cri) and [Kata Containers](https://katacontainers.io) to launch untrusted workloads.
15
+
=======
16
+
This document describes how to set up a single-machine Kubernetes cluster.
17
+
<<<<<<< HEAD
18
+
The Kubernetes cluster will use the [CRI containerd plugin](https://github.com/containerd/cri) and [Kata Containers](https://github.com/kata-containers) to launch untrusted workloads.
19
+
>>>>>>> f208a33... howto: k8s grammar and format changes
20
+
=======
21
+
The Kubernetes cluster will use the [CRI containerd plugin](https://github.com/containerd/cri/blob/master/README.md) and [Kata Containers](https://katacontainers.io) to launch untrusted workloads.
22
+
>>>>>>> 592bf58... edit
23
+
24
+
## Requirements
25
+
>>>>>>> 6486053... howto: k8s grammar and format changes
7
26
- Kubernetes, kubelet, kubeadm
8
27
- cri-containerd
9
28
- Kata Containers
10
29
30
+
<<<<<<< HEAD
31
+
<<<<<<< HEAD
11
32
For information about the supported version of these components see
12
33
Kata Containers [versions.yaml](https://github.com/kata-containers/runtime/blob/master/versions.yaml) file.
34
+
=======
35
+
<<<<<<< HEAD
36
+
=======
37
+
>>>>>>> c22d45e... made a few grammatical & format changes
38
+
Note|
39
+
----------------- |
40
+
|For information about the supported versions of these components, see the Kata Containers [versions.yaml](https://github.com/kata-containers/runtime/blob/master/versions.yaml) file. |
41
+
42
+
<<<<<<< HEAD
43
+
=======
44
+
For information about the supported versions of these components, see the Kata Containers [versions.yaml](https://github.com/kata-containers/runtime/blob/master/versions.yaml) file.
45
+
>>>>>>> f208a33... howto: k8s grammar and format changes
46
+
47
+
>>>>>>> 6486053... howto: k8s grammar and format changes
48
+
=======
49
+
50
+
>>>>>>> c22d45e... made a few grammatical & format changes
13
51
14
52
## Install containerd(with CRI plugin enabled)
15
53
16
54
Follow the instructions from [CRI installation guide](http://github.com/containerd/cri/blob/master/docs/installation.md)
17
55
18
-
<!---
19
56
```bash
20
57
# Check if containerd is installed
21
58
$ command -v containerd
22
59
```
23
-
--->
24
60
25
-
## Install Kata Containers
61
+
## Install Kata Containers
26
62
27
63
Follow the instructions to [install Kata](https://github.com/kata-containers/documentation/blob/master/install/README.md).
28
64
29
-
<!---
30
65
```bash
31
66
# Check if kata-runtime is installed
32
67
$ command -v kata-runtime
33
68
# Check kata is well configured
34
69
$ kata-runtime kata-env
35
70
```
36
-
--->
37
71
38
72
## Install Kubernetes
39
-
Install Kubernetes in your host. See kubeadm [installation](https://kubernetes.io/docs/tasks/tools/install-kubeadm/)
40
-
<!---
73
+
Install Kubernetes in your host. See kubeadm [installation](https://kubernetes.io/docs/setup/independent/install-kubeadm/)
74
+
41
75
```bash
42
76
# Check if kubadm is installed
43
77
$ command -v kubeadm
44
78
```
45
-
--->
46
79
47
80
### Configure containerd to use Kata Containers
48
81
49
-
The CRI containerd plugin support configuration for two runtime types.
82
+
The CRI containerd plugin supports configuration for two runtime types.
50
83
84
+
<<<<<<< HEAD
85
+
<<<<<<< HEAD
51
86
- Default runtime: A runtime that is used by default to run workloads.
52
87
- Untrusted workload runtime: A runtime that will be used run untrusted workloads.
88
+
=======
89
+
-**Default runtime:** A runtime that is used by default to run workloads.
90
+
<<<<<<< HEAD
91
+
-**Untrusted workload runtime:** A runtime that will be used run untrusted workloads.
92
+
=======
93
+
-**Untrusted workload runtime:** A runtime that will be used to run untrusted workloads.
94
+
>>>>>>> f208a33... howto: k8s grammar and format changes
95
+
>>>>>>> 6486053... howto: k8s grammar and format changes
96
+
97
+
#### Define the Kata runtime as `untrusted_workload_runtime`
98
+
99
+
Configure the Kata runtime for untrusted workloads with the [config option](https://github.com/containerd/cri/blob/v1.0.0-rc.0/docs/config.md)
Unless configured otherwise, the default runtime is set to `runc`.
103
+
<<<<<<< HEAD
104
+
=======
105
+
106
+
<<<<<<< HEAD
107
+
- Configure containerd to use Kata as `untrusted_workload_runtime`
108
+
=======
109
+
- Configure containerd to use Kata as `untrusted_workload_runtime`:
110
+
>>>>>>> f208a33... howto: k8s grammar and format changes
111
+
112
+
>>>>>>> 6486053... howto: k8s grammar and format changes
113
+
=======
114
+
-**Default runtime:** A runtime that is used by default to run workloads.
115
+
-**Untrusted workload runtime:** A runtime that will be used run untrusted workloads.
53
116
54
117
#### Define the Kata runtime as `untrusted_workload_runtime`
55
118
56
119
Configure the Kata runtime for untrusted workload with the [config option](https://github.com/containerd/cri/blob/v1.0.0-rc.0/docs/config.md)
Install a pod network plugin is needed to allow pods communicate with each other.
137
285
138
286
Install flannel plugging, by following the instructions in the section *Installing a pod network*
139
287
from [Using kubeadm to Create a Cluster ](https://kubernetes.io/docs/setup/independent/create-cluster-kubeadm/)
140
288
guide.
289
+
=======
290
+
### Install a Pod Network
291
+
<<<<<<< HEAD
292
+
293
+
A pod network plugin is needed to allow pods to communicate with each other.
294
+
295
+
=======
296
+
297
+
A pod network plugin is needed to allow pods to communicate with each other.
298
+
299
+
>>>>>>> f208a33... howto: k8s grammar and format changes
300
+
Install the `flannel` plugin by following the [Using kubeadm to Create a Cluster](https://kubernetes.io/docs/setup/independent/create-cluster-kubeadm/#instructions) guide, starting from the **Installing a pod network** section.
301
+
>>>>>>> 6486053... howto: k8s grammar and format changes
302
+
=======
303
+
### Install a Pod Network
304
+
305
+
A pod network plugin is needed to allow pods to communicate with each other.
306
+
307
+
Install the `flannel` plugin by following the [Using kubeadm to Create a Cluster](https://kubernetes.io/docs/setup/independent/create-cluster-kubeadm/#instructions) guide, starting from the **Installing a pod network** section.
308
+
>>>>>>> c22d45e... made a few grammatical & format changes
141
309
142
-
<!---
143
310
```bash
144
311
# Install a pod network using flannel
145
312
# There is not a programmatic way to know last what flannel commit use
146
313
# See https://github.com/coreos/flannel/issues/995
### Create an unstrusted pod using Kata Containers
178
344
179
345
By default, all pods are created with the default runtime configured in CRI containerd plugin.
346
+
<<<<<<< HEAD
347
+
<<<<<<< HEAD
180
348
If a pod has the `io.kubernetes.cri.untrusted-workload annotation`set as
181
349
`"true"`, the CRI plugin will run the pod with the Kata Containers runtime.
350
+
=======
351
+
If a pod has the `io.kubernetes.cri.untrusted-workload` annotation set to
352
+
<<<<<<< HEAD
353
+
<<<<<<< HEAD
354
+
`"true"`, the CRI plugin will run the pod with the [Kata Containers runtime](https://github.com/kata-containers/runtime).
355
+
=======
356
+
`"true"`, the CRI plugin runs the pod with the [Kata Containers runtime](https://github.com/kata-containers/runtime).
357
+
>>>>>>> f208a33... howto: k8s grammar and format changes
358
+
=======
359
+
`"true"`, the CRI plugin runs the pod with the [Kata Containers runtime](https://github.com/kata-containers/runtime/blob/master/README.md).
360
+
>>>>>>> 592bf58... edit
361
+
>>>>>>> 6486053... howto: k8s grammar and format changes
362
+
=======
363
+
If a pod has the `io.kubernetes.cri.untrusted-workload` annotation set to
364
+
`"true"`, the CRI plugin will run the pod with the [Kata Containers runtime](https://github.com/kata-containers/runtime).
365
+
>>>>>>> c22d45e... made a few grammatical & format changes
0 commit comments