From cdc131f26f6adc535913d564f8b76681a6c4b3c0 Mon Sep 17 00:00:00 2001 From: Ben Hall Date: Sat, 10 Mar 2018 23:07:40 +0000 Subject: [PATCH 1/3] Bump to release-1.9 --- cri-o.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cri-o.yml b/cri-o.yml index 92abafc..def929d 100644 --- a/cri-o.yml +++ b/cri-o.yml @@ -110,7 +110,7 @@ git: repo: https://github.com/kubernetes-incubator/cri-o dest: /root/src/github.com/kubernetes-incubator/cri-o - version: kube-1.6.x + version: release-1.9 - name: clone CNI git: From c5302fcde40a61f8c40e25bb7795d7cabf3f69da Mon Sep 17 00:00:00 2001 From: Ben Hall Date: Sun, 11 Mar 2018 12:49:03 +0000 Subject: [PATCH 2/3] Update CRIO paths --- cri-o.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cri-o.yml b/cri-o.yml index def929d..0fb0b19 100644 --- a/cri-o.yml +++ b/cri-o.yml @@ -217,7 +217,7 @@ - name: systemd dropin for kubeadm shell: | sh -c 'echo "[Service] - Environment=\"KUBELET_EXTRA_ARGS=--enable-cri=true --container-runtime=remote --runtime-request-timeout=15m --image-service-endpoint /var/run/crio.sock --container-runtime-endpoint /var/run/crio.sock\"" > /etc/systemd/system/kubelet.service.d/0-crio.conf' + Environment=\"KUBELET_EXTRA_ARGS=--container-runtime=remote --runtime-request-timeout=15m --image-service-endpoint /var/run/crio/crio.sock --container-runtime-endpoint /var/run/crio/crio.sock\"" > /etc/systemd/system/kubelet.service.d/0-crio.conf' - name: flush iptables command: "iptables -F" From e03c645315f067ed9a5f7d8ce768e414822e4e34 Mon Sep 17 00:00:00 2001 From: Ben Hall Date: Sun, 11 Mar 2018 12:50:16 +0000 Subject: [PATCH 3/3] Install crictl-v1.0.0-alpha.0-linux-amd64 --- cri-o.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cri-o.yml b/cri-o.yml index 0fb0b19..fba97ae 100644 --- a/cri-o.yml +++ b/cri-o.yml @@ -232,3 +232,11 @@ - name: disable selinux command: "setenforce 0" when: ansible_distribution in ['Fedora', 'RedHat', 'CentOS'] + + - name: install crictl + shell: | + curl -LO https://github.com/kubernetes-incubator/cri-tools/releases/download/v1.0.0-alpha.0/crictl-v1.0.0-alpha.0-linux-amd64.tar.gz + tar -xvf crictl-v1.0.0-alpha.0-linux-amd64.tar.gz + mv crictl /usr/local/bin/crictl + rm crictl-v1.0.0-alpha.0-linux-amd64.tar.gz + chmod +x /usr/local/bin/crictl