Merge pull request #823 from wilsonianb/k3s

kata-deploy: add k3s support

kata-deploy/README.md

@@ -71,8 +71,14 @@ After completing, the original `daemon.json`, if it existed, is restored and all
 ### Install Kata on a running Kubernetes cluster
 
 ```sh
-$ kubectl apply -f kata-rbac.yaml
-$ kubectl apply -f kata-deploy.yaml
+$ kubectl apply -f https://raw.githubusercontent.com/kata-containers/packaging/master/kata-deploy/kata-rbac/base/kata-rbac.yaml
+$ 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

kata-deploy/kata-cleanup/base/kustomization.yaml

@@ -0,0 +1,2 @@
+resources:
+- kata-cleanup.yaml

kata-deploy/kata-deploy/base/kustomization.yaml

@@ -0,0 +1,2 @@
+resources:
+- kata-deploy.yaml

kata-deploy/kata-deploy/overlays/k3s/kustomization.yaml

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

kata-deploy/kata-deploy/overlays/k3s/mount_k3s_conf.yaml

@@ -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/

kata-deploy/kata-rbac/base/kustomization.yaml

@@ -0,0 +1,2 @@
+resources:
+- kata-rbac.yaml

kata-deploy/scripts/kata-deploy.sh

@@ -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)