github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-28 08:17:37 +00:00
Code Issues Projects Releases Wiki Activity

kata-deploy: add k3s support

Browse Source 
By default, k3s uses an embedded containerd. Reconfiguring this
containerd requires modifying a template config file and restarting the
k3s (master node) or k3s-agent (worker node) systemd service.

Signed-off-by: Brandon Wilson <brandon@coil.com>
This commit is contained in:
Brandon Wilson 2019-08-20 14:23:30 -07:00
parent 380bd9257b
commit 9e716ae6ed
No known key found for this signature in database
GPG Key ID: 63D308951E83ECF9
4 changed files with 47 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kata-deploy/README.md
View File

@ -75,6 +75,12 @@ $ kubectl apply -f https://raw.githubusercontent.com/kata-containers/packaging/m
$ kubectl apply -f https://raw.githubusercontent.com/kata-containers/packaging/master/kata-deploy/kata-deploy/base/kata-deploy.yaml
```
or on a [k3s](https://k3s.io/) cluster:
```sh
$ kubectl apply -k github.com/kata-containers/packaging/kata-deploy/kata-deploy/overlays/k3s
```
### Run a sample workload

5
kata-deploy/kata-deploy/overlays/k3s/kustomization.yaml Normal file
View File

@ -0,0 +1,5 @@
bases:
- ../../base
patchesStrategicMerge:
- mount_k3s_conf.yaml

12
kata-deploy/kata-deploy/overlays/k3s/mount_k3s_conf.yaml Normal file
View File

@ -0,0 +1,12 @@
apiVersion: apps/v1
kind: DaemonSet
metadata:
name: kata-deploy
namespace: kube-system
spec:
template:
spec:
volumes:
- name: containerd-conf
hostPath:
path: /var/lib/rancher/k3s/agent/etc/containerd/

26
kata-deploy/scripts/kata-deploy.sh
View File

@ -36,7 +36,15 @@ function get_container_runtime() {
if [ "$?" -ne 0 ]; then
die "invalid node name"
fi
if echo "$runtime" | grep -qE 'Container Runtime Version.*containerd.*-k3s'; then
if systemctl is-active --quiet k3s-agent; then
echo "k3s-agent"
else
echo "k3s"
fi
else
echo "$runtime" | awk -F'[:]' '/Container Runtime Version/ {print $2}' | tr -d ' '
fi
}
function install_artifacts() {
@ -50,7 +58,7 @@ function configure_cri_runtime() {
crio)
configure_crio
;;
containerd)
containerd | k3s | k3s-agent)
configure_containerd
;;
esac
@ -225,7 +233,7 @@ function cleanup_cri_runtime() {
crio)
cleanup_crio
;;
containerd)
containerd | k3s | k3s-agent)
cleanup_containerd
;;
esac
@ -238,7 +246,7 @@ function cleanup_crio() {
}
function cleanup_containerd() {
rm -f /etc/containerd/config.toml
rm -f $containerd_conf_file
if [ -f "$containerd_conf_file_backup" ]; then
mv "$containerd_conf_file_backup" "$containerd_conf_file"
fi
@ -265,7 +273,9 @@ function reset_runtime() {
kubectl label node "$NODE_NAME" katacontainers.io/kata-runtime-
systemctl daemon-reload
systemctl restart "$1"
if [ "$1" == "crio" ] || [ "$1" == "containerd" ]; then
systemctl restart kubelet
fi
}
function main() {
@ -280,6 +290,14 @@ function main() {
# CRI-O isn't consistent with the naming -- let's use crio to match the service file
if [ "$runtime" == "cri-o" ]; then
runtime="crio"
elif [ "$runtime" == "k3s" ] || [ "$runtime" == "k3s-agent" ]; then
containerd_conf_tmpl_file="${containerd_conf_file}.tmpl"
if [ ! -f "$containerd_conf_tmpl_file" ]; then
cp "$containerd_conf_file" "$containerd_conf_tmpl_file"
fi
containerd_conf_file="${containerd_conf_tmpl_file}"
containerd_conf_file_backup="${containerd_conf_file}.bak"
fi
action=${1:-}
@ -289,7 +307,7 @@ function main() {
fi
# only install / remove / update if we are dealing with CRIO or containerd
if [ "$runtime" == "crio" ] || [ "$runtime" == "containerd" ]; then
if [[ "$runtime" =~ ^(crio|containerd|k3s|k3s-agent)$ ]]; then
case "$action" in
install)