From 8cba2e6fca5226988b2b3f45c6c7808bcf52cc29 Mon Sep 17 00:00:00 2001
From: Raj Chaudhuri <rajch@hotmail.com>
Date: Thu, 9 Jun 2022 07:24:47 +0530
Subject: [PATCH] Updated documentation and scripts

---
 BUILDING.md                      | 8 ++++----
 COMPONENTS.md                    | 2 +-
 Makefile                         | 2 +-
 PACKER.md                        | 6 +++---
 buildscripts/setup-kubernetes.sh | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/BUILDING.md b/BUILDING.md
index fb1958b..2dfb014 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -40,10 +40,10 @@ The following instructions are for manual building of images. For automated buil
 25. Use SSH to log on to the installation VM as kuttiadmin. Go to the **kutti-installscripts** directory and run `chmod +x *.sh`.
 26. Run `KUBE_VERSION=<version> ./setup-kubernetes.sh` to install kubernetes with containderd. Currently suppported versions are:
 
-* 1.24\* (The '*' is important)
-* 1.23*
-* 1.22*
-* 1.21*
+* 1.24
+* 1.23
+* 1.22
+
 
 27. Verify that kubeadm is installed by running `kubeadm`. Verify the kubectl autocomplete works.
 
diff --git a/COMPONENTS.md b/COMPONENTS.md
index 5b7b8ca..9ef59fe 100644
--- a/COMPONENTS.md
+++ b/COMPONENTS.md
@@ -1,7 +1,7 @@
 # Components
 
 - Debian Linux v11.3.0
-- containerd.io v1.6.4-1
+- containerd.io v1.6.6
 - kubelet, kubectl, kubeadm (appropriate versions)
 
 <img src="https://github.com/kuttiproject/driver-vbox-images/blob/main/attachments/icon/kutta.png?raw=true" width="32" height="32" />Icon made by [Freepik](https://www.freepik.com) from [Flaticon](http://www.flaticon.com)
diff --git a/Makefile b/Makefile
index 64a56e2..75c4a37 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ output-kutti-base/kutti-base.ova: kutti.step1.pkr.hcl
 	packer build -var "iso-url=$(OS_ISO_PATH)" -var "iso-checksum=$(OS_ISO_CHECKSUM)" $<
 
 output-kutti-vbox/kutti-vbox.ova: kutti.step2.pkr.hcl output-kutti-base/kutti-base.ova
-	packer build -var "vm-version=$(VERSION_STRING)" -var "vm-description=$$VM_DESCRIPTION" $<
+	packer build -var "vm-version=$(VERSION_STRING)" -var "kube-version=$(KUBE_VERSION)" -var "vm-description=$$VM_DESCRIPTION" $<
 
 .PHONY: step1
 step1: output-kutti-base/kutti-base.ova
diff --git a/PACKER.md b/PACKER.md
index 899a4a9..839c8c6 100644
--- a/PACKER.md
+++ b/PACKER.md
@@ -19,9 +19,9 @@ second step can be run multiple times to generate images for different versions
 4. Run `packer build kutti.step1.pkr.hcl` to generate an OVA for a bare OS image.
 5. Run `packer -var "kube-version=DESIREDVERSION" kutti.step2.pkr.hcl`. Here, DESIREDVERSION is the kubernetes version, as it is published in the google debian repository for Kubernetes. If you leave out the `-var "kube-version=` part, the script will pick up the latest available Kubernetes version. Currently supported values are:
 
-* 1.24\* (The '*' is important)
-* 1.23*
-* 1.22*
+* 1.24
+* 1.23
+* 1.22
 
 ## Details
 
diff --git a/buildscripts/setup-kubernetes.sh b/buildscripts/setup-kubernetes.sh
index 5179e0d..49568df 100644
--- a/buildscripts/setup-kubernetes.sh
+++ b/buildscripts/setup-kubernetes.sh
@@ -67,7 +67,7 @@ if [ "" = "${KUBE_VERSION:-}" ]; then
     apt-get install -y kubelet kubeadm kubectl
 else
     echo "Version $KUBE_VERSION"
-    apt-get install -y kubelet="$KUBE_VERSION" kubeadm="$KUBE_VERSION" kubectl="$KUBE_VERSION"
+    apt-get install -y kubelet="$KUBE_VERSION*" kubeadm="$KUBE_VERSION*" kubectl="$KUBE_VERSION*"
 fi
 apt-mark hold kubelet kubeadm kubectl
 echo "Done."