From 0e280f40fa21612f436b7f8d9257d3f850aba9c8 Mon Sep 17 00:00:00 2001 From: Ganesh Maharaj Mahalingam Date: Mon, 3 Jun 2019 23:05:00 -0700 Subject: [PATCH] cri-o update fixes ClearLinux now has cri-o version 1.14.1 which allows multiple plugin locations and also creates /opt/cni/bin by default. We no longer need the hacks for them Fixes: #82 Signed-off-by: Ganesh Maharaj Mahalingam --- clr-k8s-examples/setup_system.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/clr-k8s-examples/setup_system.sh b/clr-k8s-examples/setup_system.sh index 22d9285..f1614bf 100755 --- a/clr-k8s-examples/setup_system.sh +++ b/clr-k8s-examples/setup_system.sh @@ -52,8 +52,6 @@ sudo systemctl daemon-reload echo "The following kubelet command may complain... it is not an error" sudo systemctl enable --now kubelet crio || true -sudo mkdir -p /usr/libexec/cni /opt/cni -[ ! -e /opt/cni/bin/cni ] && sudo ln -s /usr/libexec/cni /opt/cni/bin #Ensure that the system is ready without requiring a reboot sudo swapoff -a sudo systemctl restart systemd-modules-load.service