pull in latest from kata packaging repo

Signed-off-by: Eric Ernst <eric.ernst@intel.com>

Author: Eric Ernst

kata-deploy/Dockerfile

@@ -11,6 +11,7 @@ yum install -y bzip2 jq && \
 curl -sOL ${KATA_URL}/${KATA_FILE} && \
 mkdir -p /opt/kata-artifacts && \
 tar xvf ${KATA_FILE} -C /opt/kata-artifacts/ && \
+chown -R root:root /opt/kata-artifacts/ && \
 rm ${KATA_FILE}
 
 RUN \

kata-deploy/README.md

@@ -15,7 +15,7 @@
       - [Kata deploy](#kata-deploy)
       - [Kata cleanup](#kata-cleanup)
 
-[kata-deploy](kata-deploy) provides a Dockerfile, which contains all of the binaries
+[kata-deploy](.) provides a Dockerfile, which contains all of the binaries
 and artifacts required to run Kata Containers, as well as reference daemonsets, which can
 be utilized to install Kata Containers for both Docker and on a running Kubernetes cluster.
 
@@ -80,6 +80,29 @@ Workloads which utilize Kata can node-select based on ```katacontainers.io/kata-
 run through an applicable runtime if they are marked with the appropriate runtimeClass annotation.
 
 
+In order to use a workload Kata with QEMU, first add a `RuntimeClass` as:
+- For k8s 1.14:
+  ```
+  kubectl apply -f https://raw.githubusercontent.com/kata-containers/packaging/master/kata-deploy/k8s-1.14/kata-qemu-runtimeClass.yaml
+  ```
+
+- For k8s 1.13:
+  ```
+  kubectl apply -f https://raw.githubusercontent.com/kata-containers/packaging/master/kata-deploy/k8s-1.13/kata-qemu-runtimeClass.yaml
+  ```
+
+
+In order to use a workload Kata with Firecracker, first add a `RuntimeClass` as:
+- For k8s 1.14:
+  ```
+  kubectl apply -f https://raw.githubusercontent.com/kata-containers/packaging/master/kata-deploy/k8s-1.14/kata-fc-runtimeClass.yaml
+  ```
+
+- For k8s 1.13:
+  ```
+  kubectl apply -f https://raw.githubusercontent.com/kata-containers/packaging/master/kata-deploy/k8s-1.13/kata-fc-runtimeClass.yaml
+  ```
+
 The following YAML snippet shows how to specify a workload should use Kata with QEMU:
 ```
 spec:
@@ -96,7 +119,6 @@ spec:
       runtimeClassName: kata-fc
 ```
 
-
 To run an example with kata-qemu:
 
 ```
@@ -128,7 +150,7 @@ kubectl delete -f kata-rbac.yaml
 
 ### Dockerfile
 
-The [Dockerfile](kata-deploy/Dockerfile)  used to create the container image deployed in the DaemonSet is provided here.
+The [Dockerfile](Dockerfile)  used to create the container image deployed in the DaemonSet is provided here.
 This image contains all the necessary artifacts for running Kata Containers, all of which are pulled
 from the [Kata Containers release page](https://github.com/kata-containers/runtime/releases).
 

kata-deploy/action/trigger

@@ -1,4 +1,4 @@
-VERSION=1.7.0-alpha1
+VERSION=1.5.4
 git tag --delete $VERSION
 git push origin :$VERSION
 git tag -a $VERSION -m "test tag - $VERSION" && git push origin $VERSION

kata-deploy/scripts/kata-deploy-docker.sh

@@ -39,6 +39,10 @@ function configure_docker() {
     "kata-qemu": {
       "path": "/opt/kata/bin/kata-runtime",
       "runtimeArgs": [ "--kata-config", "/opt/kata/share/defaults/kata-containers/configuration-qemu.toml" ]
+    },
+    "kata-nemu": {
+      "path": "/opt/kata/bin/kata-runtime",
+      "runtimeArgs": [ "--kata-config", "/opt/kata/share/defaults/kata-containers/configuration-nemu.toml" ]
     },
      "kata-fc": {
       "path": "/opt/kata/bin/kata-runtime",

kata-deploy/scripts/kata-deploy.sh

@@ -62,10 +62,13 @@ function configure_crio() {
 	cp -n "$crio_conf_file" "$crio_conf_file_backup"
 
 	local kata_qemu_path="/opt/kata/bin/kata-qemu"
+	local kata_nemu_path="/opt/kata/bin/kata-nemu"
 	local kata_fc_path="/opt/kata/bin/kata-fc"
 	local kata_qemu_conf="crio.runtime.runtimes.kata-qemu"
+	local kata_qemu_conf="crio.runtime.runtimes.kata-nemu"
 	local kata_fc_conf="crio.runtime.runtimes.kata-fc"
 
+	# add kata-qemu config
 	if grep -q "^\[$kata_qemu_conf\]" $crio_conf_file; then
 		echo "Configuration exists $kata_qemu_conf, overwriting"
 		sed -i "/^\[$kata_qemu_conf\]/,+1s#runtime_path.*#runtime_path = \"${kata_qemu_path}\"#" $crio_conf_file 
@@ -78,6 +81,20 @@ function configure_crio() {
 EOT
 	fi
 
+	# add kata-nemu config
+	if grep -q "^\[$kata_nemu_conf\]" $crio_conf_file; then
+		echo "Configuration exists $kata_nemu_conf, overwriting"
+		sed -i "/^\[$kata_nemu_conf\]/,+1s#runtime_path.*#runtime_path = \"${kata_nemu_path}\"#" $crio_conf_file
+	else
+		cat <<EOT | tee -a "$crio_conf_file"
+
+# Path to the Kata Containers runtime binary that uses the NEMU hypervisor.
+[$kata_nemu_conf]
+  runtime_path = "${kata_nemu_path}"
+EOT
+	fi
+
+	# add kata-fc config
 	if grep -q "^\[$kata_fc_conf\]" $crio_conf_file; then
 		echo "Configuration exists for $kata_fc_conf, overwriting"
 		sed -i "/^\[$kata_fc_conf\]/,+1s#runtime_path.*#runtime_path = \"${kata_fc_path}\"#" $crio_conf_file 
@@ -180,6 +197,7 @@ function reset_runtime() {
 	kubectl label node $NODE_NAME katacontainers.io/kata-runtime-
 	systemctl daemon-reload
 	systemctl restart $1
+	systemctl restart kubelet
 }
 
 function main() {
@@ -210,7 +228,7 @@ function main() {
 
 			install_artifacts
 			configure_cri_runtime $runtime
-			kubectl label node $NODE_NAME katacontainers.io/kata-runtime=true
+			kubectl label node $NODE_NAME --overwrite katacontainers.io/kata-runtime=true
 			;;
 		cleanup)
 			cleanup_cri_runtime $runtime