From 60584cbc68d368b2221ed29a3f288d2c7d565777 Mon Sep 17 00:00:00 2001
From: Jonas Forsberg <jonas.forsberg@suse.com>
Date: Fri, 30 Sep 2022 10:51:55 +0200
Subject: [PATCH] removed virtctl, fixed stern

---
 .functions/tools.sh | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/.functions/tools.sh b/.functions/tools.sh
index 03f65ef..4161b97 100644
--- a/.functions/tools.sh
+++ b/.functions/tools.sh
@@ -1,15 +1,14 @@
 function upgrade_tools(){
-    new_log "Install client tools"
+    echo "Install/Upgrade client tools"
     echo "- kubectl"
     echo "- helm"
     echo "- stern"
-    echo "- virtctl"
     if asktobreak; then
         return
     fi
 
-    set +e
     echo "---- kubectl ----"
+    local CURRENT_PWD="$(pwd)"
     cd $HOME/bin
     if [[ -f kubectl ]]; then
         KUBECTL_CURRENT=$(./kubectl version --client 2> /dev/null| sed -n 's/.* GitVersion:"\(v[0-9]*\.[0-9]*\.[0-9]*\)".*/\1/p')
@@ -52,25 +51,10 @@ function upgrade_tools(){
     echo "Latest stable version: $STERN_STABLE"
     if [[ "$STERN_CURRENT" != "$STERN_STABLE" ]]; then
         echo "updating to $STERN_STABLE"
-    curl -LO https://github.com/stern/stern/releases/download/$STERN_STABLE/stern_${STERN_STABLE:1}_linux_amd64.tar.gz
-    tar xvzf stern_${STERN_STABLE:1}_linux_amd64.tar.gz --strip-components=1 stern_${STERN_STABLE:1}_linux_amd64/stern
+        curl -LO https://github.com/stern/stern/releases/download/$STERN_STABLE/stern_${STERN_STABLE:1}_linux_amd64.tar.gz
+        tar xvzf stern_${STERN_STABLE:1}_linux_amd64.tar.gz stern
     rm stern_${STERN_STABLE:1}_linux_amd64.tar.gz
     fi
     echo ""
-    echo "---- virtctl ----"
-    if [[ -f stern ]]; then
-        VIRTCTL_CURRENT="$(./virtctl version --client 2> /dev/null| sed -n 's/.*GitVersion:"\(v[0-9]*\.[0-9]*\.[0-9]*\)".*/\1/p')"
-    else
-        VIRTCTL_CURRENT="N/A"
-    fi
-    VIRTCTL_STABLE="$(curl -Ls https://github.com/kubevirt/kubevirt/releases | egrep 'href="/kubevirt/kubevirt/releases/tag/v[0-9]+.[0-9]+.[0-9]+*\"' | head -n 1 | sed -n 's/.*tag\/\(v.*\)" data.*/\1/p')"
-    echo "Installed version:     $VIRTCTL_CURRENT"
-    echo "Latest stable version: $VIRTCTL_STABLE"
-    if [[ "$VIRTCTL_CURRENT" != "$VIRTCTL_STABLE" ]]; then
-        echo "updating to $VIRTCTL_STABLE"
-    curl -Lo virtctl https://github.com/kubevirt/kubevirt/releases/download/$VIRTCTL_STABLE/virtctl-$VIRTCTL_STABLE-linux-amd64
-    chmod +x ./virtctl
-    fi
-    echo ""
-    set -e
+    cd "$CURRENT_PWD"
 }