Updated documentation and scripts

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.
 

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)

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

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
 

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."