Merge pull request #763 from egernst/stable-1.9-backports

Stable 1.9 backports

kata-deploy/scripts/kata-deploy.sh

@@ -14,9 +14,10 @@ containerd_conf_file="/etc/containerd/config.toml"
 containerd_conf_file_backup="${containerd_conf_file}.bak"
 
 shims=(
-	"qemu"
-	"nemu"
 	"fc"
+	"nemu"
+	"qemu"
+	"qemu-virtiofs"
 )
 
 # If we fail for any reason a message will be displayed
@@ -93,13 +94,12 @@ EOT
 	else
 		cat <<EOT | tee -a "$crio_conf_file"
 
-# Path to the Kata Containers runtime binary that uses the QEMU hypervisor.
+# Path to the Kata Containers runtime binary that uses the QEMU hypervisor with virtiofs support.
 [$kata_qemu_conf]
   runtime_path = "${kata_qemu_virtiofs_path}"
 EOT
         fi
 
-
 	# add kata-nemu config
 	if grep -q "^\[$kata_nemu_conf\]" $crio_conf_file; then
 		echo "Configuration exists $kata_nemu_conf, overwriting"
@@ -160,14 +160,18 @@ function configure_containerd() {
         runtime_type = "io.containerd.kata-qemu.v2"
         [plugins.cri.containerd.runtimes.kata-qemu.options]
 	      ConfigPath = "/opt/kata/share/defaults/kata-containers/configuration-qemu.toml"
+     [plugins.cri.containerd.runtimes.kata-qemu-virtiofs]
+        runtime_type = "io.containerd.kata-qemu-virtiofs.v2"
+        [plugins.cri.containerd.runtimes.kata-qemu-virtiofs.options]
+	      ConfigPath = "/opt/kata/share/defaults/kata-containers/configuration-qemu-virtiofs.toml"
      [plugins.cri.containerd.runtimes.kata-nemu]
         runtime_type = "io.containerd.kata-nemu.v2"
         [plugins.cri.containerd.runtimes.kata-nemu.options]
 	      ConfigPath = "/opt/kata/share/defaults/kata-containers/configuration-nemu.toml"
 EOT
 	#Currently containerd has an assumption on the location of the shimv2 implementation
 	#Until support is added (see https://github.com/containerd/containerd/issues/3073),
-    #create a link in /usr/local/bin/ to the v2-shim implementation in /opt/kata/bin.
+	#create a link in /usr/local/bin/ to the v2-shim implementation in /opt/kata/bin.
 
 	mkdir -p /usr/local/bin
 
@@ -188,7 +192,7 @@ EOT
 #!/bin/bash
 KATA_CONF_FILE=/opt/kata/share/defaults/kata-containers/configuration-${shim}.toml /opt/kata/bin/containerd-shim-kata-v2 \$@
 EOT
-       chmod +x $shim_file
+	chmod +x $shim_file
 	done
 }
 

release/kata-deploy-binaries.sh

@@ -235,6 +235,12 @@ ${prefix}/bin/kata-runtime --kata-config "${prefix}/share/defaults/${project}/co
 EOT
 	sudo chmod +x kata-nemu
 
+	cat <<EOT | sudo tee kata-qemu-virtiofs
+#!/bin/bash
+${prefix}/bin/kata-runtime --kata-config "${prefix}/share/defaults/${project}/configuration-qemu-virtiofs.toml" \$@
+EOT
+	sudo chmod +x kata-qemu-virtiofs
+
 	popd
 }
 

release/update-repository-version.sh

@@ -123,7 +123,7 @@ EOT
 	if (echo "${current_version}" | grep "alpha") && (echo "${new_version}" | grep -v "alpha");then
 		info "update move from alpha, check if new version is rc0"
 		if echo "$new_version" | grep -v "rc0"; then
-			die "bump should be from alph to rc0"
+			die "bump should be from alpha to rc0"
 		fi
 		info "OK"
 	fi