From e08c92f6d589fc806276f8f5f8108e6cd5585116 Mon Sep 17 00:00:00 2001 From: Jose Carlos Venegas Munoz Date: Fri, 24 May 2019 01:39:37 +0000 Subject: [PATCH] stack: do not provide CRI socket kubeadm autodetects the socket path based on defaults from well known CRI servers. Signed-off-by: Jose Carlos Venegas Munoz --- clr-k8s-examples/kubeadm.yaml | 2 -- clr-k8s-examples/reset_stack.sh | 7 +++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/clr-k8s-examples/kubeadm.yaml b/clr-k8s-examples/kubeadm.yaml index de436b2..d2a92f1 100644 --- a/clr-k8s-examples/kubeadm.yaml +++ b/clr-k8s-examples/kubeadm.yaml @@ -1,7 +1,5 @@ apiVersion: kubeadm.k8s.io/v1beta1 kind: InitConfiguration -nodeRegistration: - criSocket: /var/run/crio/crio.sock --- apiVersion: kubelet.config.k8s.io/v1beta1 kind: KubeletConfiguration diff --git a/clr-k8s-examples/reset_stack.sh b/clr-k8s-examples/reset_stack.sh index 77a5118..f995fb3 100755 --- a/clr-k8s-examples/reset_stack.sh +++ b/clr-k8s-examples/reset_stack.sh @@ -3,7 +3,10 @@ set -o nounset #Cleanup -sudo -E kubeadm reset -f --cri-socket="/var/run/crio/crio.sock" +reset_cluster() { + sudo -E kubeadm reset -f +} +reset_cluster for ctr in $(sudo crictl ps --quiet); do sudo crictl stop "$ctr" @@ -43,4 +46,4 @@ sudo systemctl enable kubelet crio sudo systemctl restart crio sudo systemctl restart kubelet -sudo -E kubeadm reset -f --cri-socket="/var/run/crio/crio.sock" +reset_cluster