From a5c863085228b5706d99cb2ad7e5935f2036aa56 Mon Sep 17 00:00:00 2001 From: Jaehyun Nam Date: Mon, 23 May 2022 10:30:08 +0000 Subject: [PATCH] update install_k3s.sh Signed-off-by: Jaehyun Nam --- contribution/k3s/install_k3s.sh | 42 ++++++++++++++++----------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/contribution/k3s/install_k3s.sh b/contribution/k3s/install_k3s.sh index 85665469e6..7f2abc5802 100755 --- a/contribution/k3s/install_k3s.sh +++ b/contribution/k3s/install_k3s.sh @@ -4,17 +4,17 @@ # create a single-node K3s cluster if [ -x "$(command -v docker)" ]; then # docker - CGROUP_SYSTEMD=$(docker info 2> /dev/null | grep -i cgroup | grep systemd | wc -l) - if [ $CGROUP_SYSTEMD == 1 ]; then - curl -sfL https://get.k3s.io | K3S_KUBECONFIG_MODE="644" INSTALL_K3S_EXEC="--disable=traefik --docker --kubelet-arg cgroup-driver=systemd" sh - - [[ $? != 0 ]] && echo "Failed to install k3s" && exit 1 - else # cgroupfs - curl -sfL https://get.k3s.io | K3S_KUBECONFIG_MODE="644" INSTALL_K3S_EXEC="--disable=traefik --docker" sh - - [[ $? != 0 ]] && echo "Failed to install k3s" && exit 1 - fi + CGROUP_SYSTEMD=$(docker info 2> /dev/null | grep -i cgroup | grep systemd | wc -l) + if [ $CGROUP_SYSTEMD == 1 ]; then + curl -sfL https://get.k3s.io | K3S_KUBECONFIG_MODE="644" INSTALL_K3S_EXEC="--disable=traefik --docker --kubelet-arg cgroup-driver=systemd" sh - + [[ $? != 0 ]] && echo "Failed to install k3s" && exit 1 + else # cgroupfs + curl -sfL https://get.k3s.io | K3S_KUBECONFIG_MODE="644" INSTALL_K3S_EXEC="--disable=traefik --docker" sh - + [[ $? != 0 ]] && echo "Failed to install k3s" && exit 1 + fi else # containerd - curl -sfL https://get.k3s.io | K3S_KUBECONFIG_MODE="644" INSTALL_K3S_EXEC="--disable=traefik" sh - - [[ $? != 0 ]] && echo "Failed to install k3s" && exit 1 + curl -sfL https://get.k3s.io | K3S_KUBECONFIG_MODE="644" INSTALL_K3S_EXEC="--disable=traefik" sh - + [[ $? != 0 ]] && echo "Failed to install k3s" && exit 1 fi if [[ $(hostname) = kubearmor-dev* ]]; then @@ -22,14 +22,14 @@ if [[ $(hostname) = kubearmor-dev* ]]; then sudo cp /etc/rancher/k3s/k3s.yaml /home/vagrant/.kube/config sudo chown -R vagrant:vagrant /home/vagrant/.kube else - KUBEDIR=$HOME/.kube - KUBECONFIG=$KUBEDIR/config + KUBEDIR=$HOME/.kube + KUBECONFIG=$KUBEDIR/config [[ ! -d $KUBEDIR ]] && mkdir $KUBEDIR - if [ -f $KUBECONFIG ]; then - echo "Found $KUBECONFIG already in place ... backing it up to $KUBECONFIG.backup" - cp $KUBECONFIG $KUBECONFIG.backup - fi - sudo cp /etc/rancher/k3s/k3s.yaml $KUBECONFIG + if [ -f $KUBECONFIG ]; then + echo "Found $KUBECONFIG already in place ... backing it up to $KUBECONFIG.backup" + cp $KUBECONFIG $KUBECONFIG.backup + fi + sudo cp /etc/rancher/k3s/k3s.yaml $KUBECONFIG sudo chown $USER:$USER $KUBECONFIG fi @@ -38,10 +38,10 @@ sleep 15 for (( ; ; )) do - status=$(kubectl get pods -A -o jsonpath={.items[*].status.phase}) - [[ $(echo $status | grep -v Running | wc -l) -eq 0 ]] && break - echo "wait for initialization" - sleep 1 + status=$(kubectl get pods -A -o jsonpath={.items[*].status.phase}) + [[ $(echo $status | grep -v Running | wc -l) -eq 0 ]] && break + echo "wait for initialization" + sleep 1 done kubectl get pods -A