From 2ef31c7973fd4fd20d5822b6cc0cc62314e868d3 Mon Sep 17 00:00:00 2001 From: Jose Carlos Venegas Munoz Date: Mon, 14 Oct 2019 21:54:42 +0000 Subject: [PATCH 1/4] kata-deploy: Add qemu-virtiofs wrapper Tarball is missing to provide a wrapper for qemu-virtiofs Fixes: #756 Signed-off-by: Jose Carlos Venegas Munoz --- release/kata-deploy-binaries.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/release/kata-deploy-binaries.sh b/release/kata-deploy-binaries.sh index ab9cdef1..143a8f20 100755 --- a/release/kata-deploy-binaries.sh +++ b/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 < Date: Tue, 15 Oct 2019 10:53:43 -0500 Subject: [PATCH 2/4] release: Fixing message information This replaces the alph to alpha on the message information. Fixes #758 Signed-off-by: Gabriela Cervantes --- release/update-repository-version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/update-repository-version.sh b/release/update-repository-version.sh index 92c0581b..49de6a6a 100755 --- a/release/update-repository-version.sh +++ b/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 From 482f93248cfdd6aad334aa4eb1d0d9792eaeafe2 Mon Sep 17 00:00:00 2001 From: Salvador Fuentes Date: Tue, 15 Oct 2019 15:12:42 -0500 Subject: [PATCH 3/4] kata-deploy: Add qemu-virtiofs to containerd configuration We need an entry of `kata-qemu-virtiofs` on the containerd configuration file. In addition we need to add `kata-qemu-virtiofs` to the shim list, so that the wrapper is created for shimv2. Fixes: #760. Signed-off-by: Salvador Fuentes --- kata-deploy/scripts/kata-deploy.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/kata-deploy/scripts/kata-deploy.sh b/kata-deploy/scripts/kata-deploy.sh index 83afa8a5..9b1bff34 100755 --- a/kata-deploy/scripts/kata-deploy.sh +++ b/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,7 +94,7 @@ EOT else cat < Date: Tue, 15 Oct 2019 15:25:37 -0500 Subject: [PATCH 4/4] kata-deploy: Fix indentation issues. Fix indentation issues on `kata-deploy.sh` file. Signed-off-by: Salvador Fuentes --- kata-deploy/scripts/kata-deploy.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/kata-deploy/scripts/kata-deploy.sh b/kata-deploy/scripts/kata-deploy.sh index 9b1bff34..4e64ade9 100755 --- a/kata-deploy/scripts/kata-deploy.sh +++ b/kata-deploy/scripts/kata-deploy.sh @@ -100,7 +100,6 @@ EOT EOT fi - # add kata-nemu config if grep -q "^\[$kata_nemu_conf\]" $crio_conf_file; then echo "Configuration exists $kata_nemu_conf, overwriting" @@ -172,7 +171,7 @@ function configure_containerd() { 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 @@ -193,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 }