From d0c7bb35138645b31d34805a136670059e338720 Mon Sep 17 00:00:00 2001 From: Eric Ernst Date: Wed, 27 Mar 2019 20:18:59 -0700 Subject: [PATCH] kata-deploy: update to match what's on Kata master We updated to use containerd v2 shim - pull in latest from master Signed-off-by: Eric Ernst --- clr-k8s-examples/8-kata/deploy/kata-cleanup.yaml | 2 +- clr-k8s-examples/8-kata/deploy/kata-deploy.yaml | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/clr-k8s-examples/8-kata/deploy/kata-cleanup.yaml b/clr-k8s-examples/8-kata/deploy/kata-cleanup.yaml index 6fce410..5e80c0f 100644 --- a/clr-k8s-examples/8-kata/deploy/kata-cleanup.yaml +++ b/clr-k8s-examples/8-kata/deploy/kata-cleanup.yaml @@ -20,7 +20,7 @@ spec: - name: kube-kata-cleanup image: katadocker/kata-deploy imagePullPolicy: Always - command: ["/bin/bash", "-c", "/opt/kata-artifacts/scripts/kata-deploy.sh reset"] + command: [ "bash", "-c", "/opt/kata-artifacts/scripts/kata-deploy.sh reset" ] env: - name: NODE_NAME valueFrom: diff --git a/clr-k8s-examples/8-kata/deploy/kata-deploy.yaml b/clr-k8s-examples/8-kata/deploy/kata-deploy.yaml index 0346c3b..9d47703 100644 --- a/clr-k8s-examples/8-kata/deploy/kata-deploy.yaml +++ b/clr-k8s-examples/8-kata/deploy/kata-deploy.yaml @@ -21,8 +21,8 @@ spec: lifecycle: preStop: exec: - command: ["/bin/bash", "-c", "/opt/kata-artifacts/scripts/kata-deploy.sh cleanup"] - command: ["/bin/bash", "-c", "/opt/kata-artifacts/scripts/kata-deploy.sh install"] + command: ["bash", "-c", "/opt/kata-artifacts/scripts/kata-deploy.sh cleanup"] + command: [ "bash", "-c", "/opt/kata-artifacts/scripts/kata-deploy.sh install" ] env: - name: NODE_NAME valueFrom: @@ -41,6 +41,8 @@ spec: mountPath: /var/run/dbus - name: systemd mountPath: /run/systemd + - name: local-bin + mountPath: /usr/local/bin/ volumes: - name: crio-conf hostPath: @@ -58,6 +60,9 @@ spec: - name: systemd hostPath: path: /run/systemd + - name: local-bin + hostPath: + path: /usr/local/bin/ updateStrategy: rollingUpdate: maxUnavailable: 1