From 2d07689ffec165431aa18e3762d9ade07f112998 Mon Sep 17 00:00:00 2001 From: Eric Ernst Date: Tue, 14 Aug 2018 13:06:44 -0700 Subject: [PATCH 1/2] kata-deploy: changes for 1.2.0 release 1.2.0 release changed the tarball file layout for the Kata artifacts. Adjust scripts accordingly. Fixes: #142 Signed-off-by: Eric Ernst --- kata-deploy/kata-deploy.yaml | 12 ------------ kata-deploy/scripts/install-kata-containerd.sh | 10 +--------- kata-deploy/scripts/install-kata-crio.sh | 11 ++--------- kata-deploy/scripts/remove-kata-containerd.sh | 1 - kata-deploy/scripts/remove-kata-crio.sh | 1 - 5 files changed, 3 insertions(+), 32 deletions(-) diff --git a/kata-deploy/kata-deploy.yaml b/kata-deploy/kata-deploy.yaml index 7c4388028f..419f991b7d 100644 --- a/kata-deploy/kata-deploy.yaml +++ b/kata-deploy/kata-deploy.yaml @@ -77,8 +77,6 @@ spec: volumeMounts: - name: crio-conf mountPath: /etc/crio/ - - name: kata-conf - mountPath: /usr/share/defaults/kata-containers/ - name: kata-artifacts mountPath: /opt/kata/ - name: dbus @@ -89,10 +87,6 @@ spec: - name: crio-conf hostPath: path: /etc/crio/ - - name: kata-conf - hostPath: - path: /usr/share/defaults/kata-containers/ - type: DirectoryOrCreate - name: kata-artifacts hostPath: path: /opt/kata/ @@ -148,8 +142,6 @@ spec: volumeMounts: - name: containerd-conf mountPath: /etc/containerd/ - - name: kata-conf - mountPath: /usr/share/defaults/kata-containers/ - name: kata-artifacts mountPath: /opt/kata/ - name: dbus @@ -161,10 +153,6 @@ spec: hostPath: path: /etc/containerd/ type: DirectoryOrCreate - - name: kata-conf - hostPath: - path: /usr/share/defaults/kata-containers/ - type: DirectoryOrCreate - name: kata-artifacts hostPath: path: /opt/kata/ diff --git a/kata-deploy/scripts/install-kata-containerd.sh b/kata-deploy/scripts/install-kata-containerd.sh index a61f7b47b6..085b83971b 100755 --- a/kata-deploy/scripts/install-kata-containerd.sh +++ b/kata-deploy/scripts/install-kata-containerd.sh @@ -1,16 +1,8 @@ #!/bin/sh echo "copying kata artifacts onto host" -cp -R /opt/kata-artifacts/bin /opt/kata/ -mkdir /opt/kata/share -mv /opt/kata/bin/qemu /opt/kata/share/ +cp -R /opt/kata-artifacts/opt/kata/* /opt/kata/ chmod +x /opt/kata/bin/* -cp /opt/kata-artifacts/configuration.toml /usr/share/defaults/kata-containers/configuration.toml - -# Update Kata configuration for /opt/kata path usage -sed -i 's!/usr.*kata-containers/!/opt/kata/bin/!' /usr/share/defaults/kata-containers/configuration.toml -sed -i 's!/usr/bin/!/opt/kata/bin/!' /usr/share/defaults/kata-containers/configuration.toml -sed -i 's!qemu-lite!qemu!' /usr/share/defaults/kata-containers/configuration.toml # Configure containerd to use Kata: echo "create containerd configuration for Kata" diff --git a/kata-deploy/scripts/install-kata-crio.sh b/kata-deploy/scripts/install-kata-crio.sh index 4e5e7088e1..d6efc844ac 100755 --- a/kata-deploy/scripts/install-kata-crio.sh +++ b/kata-deploy/scripts/install-kata-crio.sh @@ -1,17 +1,10 @@ #!/bin/sh echo "copying kata artifacts onto host" -cp -R /opt/kata-artifacts/bin /opt/kata/ -mkdir /opt/kata/share -mv /opt/kata/bin/qemu /opt/kata/share/ +cp -R /opt/kata-artifacts/opt/kata/* /opt/kata/ chmod +x /opt/kata/bin/* -cp /opt/kata-artifacts/configuration.toml /usr/share/defaults/kata-containers/configuration.toml - -# Update Kata configuration for /opt/kata path usage -sed -i 's!/usr.*kata-containers/!/opt/kata/bin/!' /usr/share/defaults/kata-containers/configuration.toml -sed -i 's!/usr/bin/!/opt/kata/bin/!' /usr/share/defaults/kata-containers/configuration.toml -sed -i 's!qemu-lite!qemu!' /usr/share/defaults/kata-containers/configuration.toml +# Configure crio to use Kata: echo "Set Kata containers as default runtime in CRI-O for untrusted workloads" cp /etc/crio/crio.conf /etc/crio/crio.conf.bak sed -i '/runtime_untrusted_workload = /c\runtime_untrusted_workload = "/opt/kata/bin/kata-runtime"' /etc/crio/crio.conf diff --git a/kata-deploy/scripts/remove-kata-containerd.sh b/kata-deploy/scripts/remove-kata-containerd.sh index 0742de476d..f6d5badf93 100755 --- a/kata-deploy/scripts/remove-kata-containerd.sh +++ b/kata-deploy/scripts/remove-kata-containerd.sh @@ -1,7 +1,6 @@ #!/bin/sh echo "delete kata artifacts" rm -rf /opt/kata -rm -rf /usr/share/defaults/kata-containers rm -f /etc/containerd/config.toml if [ -f /etc/containerd/config.toml.bak ]; then diff --git a/kata-deploy/scripts/remove-kata-crio.sh b/kata-deploy/scripts/remove-kata-crio.sh index b23e40932d..14e79c28f4 100755 --- a/kata-deploy/scripts/remove-kata-crio.sh +++ b/kata-deploy/scripts/remove-kata-crio.sh @@ -1,5 +1,4 @@ #!/bin/sh echo "deleting kata artifacts" rm -rf /opt/kata/ -rm -rf /usr/share/defaults/kata-containers mv /etc/crio/crio.conf.bak /etc/crio/crio.conf From 4d95d8d9d5c5ae0c83bf11e279de8ed7c52b4009 Mon Sep 17 00:00:00 2001 From: Eric Ernst Date: Tue, 14 Aug 2018 16:05:49 -0700 Subject: [PATCH 2/2] kata-deploy: use latest container image Signed-off-by: Eric Ernst --- kata-deploy/kata-cleanup.yaml | 2 +- kata-deploy/kata-deploy.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kata-deploy/kata-cleanup.yaml b/kata-deploy/kata-cleanup.yaml index 36133ccf56..92b75d9efe 100644 --- a/kata-deploy/kata-cleanup.yaml +++ b/kata-deploy/kata-cleanup.yaml @@ -18,7 +18,7 @@ spec: kata-containers.io/kata-runtime: cleanup containers: - name: kube-kata-cleanup - image: katadocker/kata-deploy:1.1.0 + image: katadocker/kata-deploy imagePullPolicy: Always command: [ "sh", "-c" ] args: diff --git a/kata-deploy/kata-deploy.yaml b/kata-deploy/kata-deploy.yaml index 419f991b7d..f618784fe4 100644 --- a/kata-deploy/kata-deploy.yaml +++ b/kata-deploy/kata-deploy.yaml @@ -16,7 +16,7 @@ spec: serviceAccountName: kata-label-node containers: - name: kubelet-runtime-labeler-pod - image: katadocker/kata-deploy:1.1.0 + image: katadocker/kata-deploy imagePullPolicy: Always command: [ "sh", "-c" ] args: @@ -56,7 +56,7 @@ spec: kata-containers.io/container-runtime: cri-o containers: - name: kube-kata - image: katadocker/kata-deploy:1.1.0 + image: katadocker/kata-deploy imagePullPolicy: Always lifecycle: preStop: @@ -121,7 +121,7 @@ spec: kata-containers.io/container-runtime: containerd containers: - name: kube-kata - image: katadocker/kata-deploy:1.1.0 + image: katadocker/kata-deploy imagePullPolicy: Always lifecycle: preStop: