Merging k9s (#66)

Signed-off-by: Josh Cox <[email protected]>
joshuacox · Sep 17, 2020 · b08f772 · b08f772
1 parent 3dcefa6
commit b08f772
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@
 $(eval CT_VERSION := "v0.9.0")
 $(eval CNI_VERSION := "v0.8.5")
 $(eval NVM_VERSION := "v0.35.3")
-$(eval PACKER_VERSION := "1.6.1")
+$(eval PACKER_VERSION := "1.6.2")
 $(eval CRICTL_VERSION := "v1.18.0")
 
 # Install location
@@ -53,6 +53,9 @@ $(eval HELM_INSTALL_DIR := "$(KUBASH_BIN)")
 # Istio
 $(eval ISTIO_VERSION := "1.6.7")
 
+# K9S
+$(eval K9S_VERSIION := "v0.21.7")
+
 all: $(KUBASH_BIN)/kush $(KUBASH_BIN)/kzsh $(KUBASH_BIN)/kudash reqs anaconda nvm
 
 reqs: linuxreqs
@@ -96,6 +99,16 @@ $(KUBASH_BIN)/istioctl:
 	rm -Rf $(TMP)/istio-$(ISTIO_VERSION)
 	rmdir $(TMP)
 
+k9s: $(KUBASH_BIN)
+	@scripts/kubashnstaller k9s
+
+$(KUBASH_BIN)/k9s:
+	@echo 'Installing k9s'
+	$(eval TMP := $(shell mktemp -d --suffix=KUBECTLTMP))
+	cd $(TMP) && \
+	curl -L https://github.com/derailed/k9s/releases/download/v0.21.7/k9s_Linux_x86_64.tar.gz |tar zxf -
+	mv $(TMP)/k9s $(KUBASH_DIR)/bin/
+	rm -Rf $(TMP)
 
 kubectl: $(KUBASH_BIN)
 	@scripts/kubashnstaller kubectl

diff --git a/submodules/istio b/submodules/istio
diff --git a/submodules/kubespray b/submodules/kubespray
diff --git a/submodules/openshift-ansible b/submodules/openshift-ansible
diff --git a/submodules/pupernetes b/submodules/pupernetes
diff --git a/submodules/rook b/submodules/rook
diff --git a/templates/bionic-kube.tpl/bionicREPLACEME_KUBE_VERSION-18.04-amd64.json b/templates/bionic-kube.tpl/bionicREPLACEME_KUBE_VERSION-18.04-amd64.json
@@ -293,17 +293,15 @@
     "https_proxy": "{{env `https_proxy`}}",
     "hyperv_generation": "2",
     "hyperv_switch": "{{env `hyperv_switch`}}",
-    "iso_checksum": "e2ecdace33c939527cbc9e8d23576381c493b071107207d2040af72595f8990b",
-    "iso_checksum_type": "sha256",
-    "iso_name": "ubuntu-18.04.4-server-amd64.iso",
+    "iso_checksum": "8c5fc24894394035402f66f3824beb7234b757dd2b5531379cb310cedfdf0996",
+    "iso_name": "ubuntu-18.04.5-server-amd64.iso",
     "memory": "2048",
     "mirror": "http://cdimage.ubuntu.com",
-    "mirror_directory": "ubuntu/releases/18.04.4/release",
+    "mirror_directory": "ubuntu/releases/18.04.5/release",
     "name": "kubash-REPLACEME_KUBE_VERSION-18.04",
     "no_proxy": "{{env `no_proxy`}}",
     "preseed_path": "preseed.cfg",
     "template": "bionicREPLACEME_KUBE_VERSION-18.04-amd64",
     "version": "TIMESTAMP"
   }
 }
-