From ea91fff56b06db3691bb69ba4c517c3fd09482bd Mon Sep 17 00:00:00 2001 From: Eric Ernst Date: Tue, 14 Aug 2018 15:43:53 -0700 Subject: [PATCH 1/2] kata-deploy: pull particular version of deploy image For 1.2.0 we are changing the format of the kata-deploy container image. To avoid issues, pull an explicit version in our daemonset. In a follow on PR we'll update the yaml/scripts to 1.2.0 format Fixes: #135 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 92b75d9efe..36133ccf56 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 + image: katadocker/kata-deploy:1.1.0 imagePullPolicy: Always command: [ "sh", "-c" ] args: diff --git a/kata-deploy/kata-deploy.yaml b/kata-deploy/kata-deploy.yaml index 922d38bbac..7c4388028f 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 + image: katadocker/kata-deploy:1.1.0 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 + image: katadocker/kata-deploy:1.1.0 imagePullPolicy: Always lifecycle: preStop: @@ -127,7 +127,7 @@ spec: kata-containers.io/container-runtime: containerd containers: - name: kube-kata - image: katadocker/kata-deploy + image: katadocker/kata-deploy:1.1.0 imagePullPolicy: Always lifecycle: preStop: From 80ce32333246abec4e05bec3999185c409213879 Mon Sep 17 00:00:00 2001 From: Eric Ernst Date: Tue, 14 Aug 2018 15:47:12 -0700 Subject: [PATCH 2/2] kata-deploy: update Dockerfile to 1.2.0 kata-deploy container image changed format slightly as we've changed the release tarball. Update to 1.2.0 and make adjustments accordingly. Fixes: #135 Signed-off-by: Eric Ernst --- kata-deploy/Dockerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/kata-deploy/Dockerfile b/kata-deploy/Dockerfile index 543804bde2..75d6151bb1 100644 --- a/kata-deploy/Dockerfile +++ b/kata-deploy/Dockerfile @@ -1,13 +1,15 @@ FROM centos/systemd -ARG KATA_VER=1.1.0 +ARG KATA_VER=1.2.0 +ARG ARCH=x86_64 ARG KATA_URL=https://github.com/kata-containers/runtime/releases/download/${KATA_VER} +ARG KATA_FILE=kata-static-${KATA_VER}-${ARCH}.tar.xz ARG KUBECTL_VER=v1.10.2 RUN \ -curl -sOL ${KATA_URL}/kata-release-binaries.tar.xz && \ +curl -sOL ${KATA_URL}/${KATA_FILE} && \ mkdir -p /opt/kata-artifacts && \ -tar xvf kata-release-binaries.tar.xz -C /opt/kata-artifacts && \ -rm kata-release-binaries.tar.xz +tar xvf ${KATA_FILE} -C /opt/kata-artifacts/ && \ +rm ${KATA_FILE} RUN \ curl -s -o /bin/kubectl https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VER}/bin/linux/amd64/kubectl && \