From b8bea5e149798478ecbb07deec102364541afe8a Mon Sep 17 00:00:00 2001
From: Matt Nikkel <matt.nikkel@rancher.com>
Date: Tue, 1 Sep 2020 11:47:55 -0400
Subject: [PATCH] Clean up k3s vagrant install script

---
 vagrant-scripts/k3s-install.sh | 24 +++++++++++++-----------
 vagrant-scripts/k3s-prep.sh    | 26 ++++++++++++++------------
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/vagrant-scripts/k3s-install.sh b/vagrant-scripts/k3s-install.sh
index c38e9e7..519488f 100755
--- a/vagrant-scripts/k3s-install.sh
+++ b/vagrant-scripts/k3s-install.sh
@@ -13,27 +13,29 @@ fi
 
 if pgrep -x "firewalld" >/dev/null
 then
-    echo "[FATAL] disable firewalld first"
+  echo "[FATAL] disable firewalld first"
 fi
 
 SELINUXSTATUS=$(getenforce)
-  if [ "$SELINUXSTATUS" == "Permissive" ]; then
-      echo "[FATAL] disable selinux"
-      exit 1
-  else
-      echo "SELINUX disabled. continuing"
-  fi
+if [ "$SELINUXSTATUS" == "Permissive" ]; then
+    echo "[FATAL] disable selinux"
+    exit 1
+else
+    echo "SELINUX disabled. continuing"
+fi
 
 LOCAL_IMAGES_FILEPATH=/var/lib/rancher/k3s/agent/images
+ARTIFACT_DIR=/opt/k3ama/local-artifacts/k3s
 
 mkdir -p ${LOCAL_IMAGES_FILEPATH}
-cp /opt/k3ama/local-artifacts/images/k3s-airgap-images-amd64.tar ${LOCAL_IMAGES_FILEPATH}
 
-cp /opt/k3ama/local-artifacts/bin/k3s /usr/local/bin/k3s
+cp ${ARTIFACT_DIR}/images/* ${LOCAL_IMAGES_FILEPATH}
+
+cp ${ARTIFACT_DIR}/bin/k3s /usr/local/bin/k3s
 chmod +x /usr/local/bin/k3s
 
-yum install -y /opt/k3ama/local-artifacts/rpm/*
+yum install -y ${ARTIFACT_DIR}/rpm/*
 
-INSTALL_K3S_SKIP_DOWNLOAD=true /opt/k3ama/local-artifacts/bin/k3s-install.sh
+INSTALL_K3S_SKIP_DOWNLOAD=true ${ARTIFACT_DIR}/bin/k3s-install.sh
 
 chmod +r /etc/rancher/k3s/k3s.yaml
diff --git a/vagrant-scripts/k3s-prep.sh b/vagrant-scripts/k3s-prep.sh
index 66afef7..8acf433 100755
--- a/vagrant-scripts/k3s-prep.sh
+++ b/vagrant-scripts/k3s-prep.sh
@@ -6,33 +6,35 @@
 # to the folder shared with the host machine.
 ################################################################################
 
-BASE_SHARED_DIR=/opt/k3ama
+BASE_SHARED_DIR="/opt/k3ama"
 VAGRANT_SCRIPTS_DIR="${BASE_SHARED_DIR}/vagrant-scripts"
+ARTIFACTS_DIR="${BASE_SHARED_DIR}/local-artifacts/k3s"
 
-K3S_VERSION='v1.18.8%2Bk3s1'
+K3S_VERSION='v1.18.8+k3s1'
+K3S_VERSION_URL='v1.18.8%2Bk3s1'
 
-ADDL_IMAGES="${BASE_SHARED_DIR}/local-artifacts/images"
-LOCAL_BIN="${BASE_SHARED_DIR}/local-artifacts/bin"
-LOCAL_RPM="${BASE_SHARED_DIR}/local-artifacts/rpm"
+LOCAL_IMAGES="${ARTIFACTS_DIR}/images"
+LOCAL_BIN="${ARTIFACTS_DIR}/bin"
+LOCAL_RPM="${ARTIFACTS_DIR}/rpm"
 
-mkdir -p ${ADDL_IMAGES}
+mkdir -p ${LOCAL_IMAGES}
 mkdir -p ${LOCAL_BIN}
+mkdir -p ${LOCAL_RPM}
 
 # temporarily allow internet access
 ${VAGRANT_SCRIPTS_DIR}/airgap.sh internet
 
-pushd ${ADDL_IMAGES}
+pushd ${LOCAL_IMAGES}
 
-curl -LO https://github.com/rancher/k3s/releases/download/${K3S_VERSION}/k3s-airgap-images-amd64.tar
+curl -LO https://github.com/rancher/k3s/releases/download/${K3S_VERSION_URL}/k3s-airgap-images-amd64.tar
 
 popd
 
 pushd ${LOCAL_BIN}
 
-curl -LO https://github.com/rancher/k3s/releases/download/${K3S_VERSION}/k3s
-chmod +x k3s
-curl -L https://raw.githubusercontent.com/rancher/k3s/${K3S_VERSION}/install.sh -o k3s-install.sh
-chmod +x k3s-install.sh
+curl -LO https://github.com/rancher/k3s/releases/download/${K3S_VERSION_URL}/k3s
+curl -L https://raw.githubusercontent.com/rancher/k3s/${K3S_VERSION_URL}/install.sh -o k3s-install.sh
+chmod +x ./*
 
 popd