From b592b9625b1bdaf5bc0b332efdcaf8c742fcd6fa Mon Sep 17 00:00:00 2001
From: Ricardo Rosales <728243+missingcharacter@users.noreply.github.com>
Date: Wed, 6 Dec 2023 22:43:00 -0600
Subject: [PATCH 1/2] [~] Bumped: - kubernetes to `1.28.4` - etcd to `3.5.10` -
 containerd to `1.7.10` - cni-plugins to `1.4.0` - coredns helm chart to
 `1.28.2` - cilium helm chart to `1.14.4`

---
 setup.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/setup.sh b/setup.sh
index 1247eac..e3f0747 100755
--- a/setup.sh
+++ b/setup.sh
@@ -34,12 +34,12 @@ function check_dependencies() {
 check_dependencies
 
 export \
-  KUBERNETES_VERSION='1.25.4' \
-  ETCD_VERSION='3.5.5' \
-  CONTAINERD_VERSION='1.6.10' \
-  CNI_PLUGINS_VERSION='1.1.1' \
-  COREDNS_CHART_VERSION='1.19.7' \
-  CILIUM_CHART_VERSION='1.12.4' \
+  KUBERNETES_VERSION='1.28.4' \
+  ETCD_VERSION='3.5.10' \
+  CONTAINERD_VERSION='1.7.10' \
+  CNI_PLUGINS_VERSION='1.4.0' \
+  COREDNS_CHART_VERSION='1.28.2' \
+  CILIUM_CHART_VERSION='1.14.4' \
   SERVICE_CLUSTER_IP_RANGE='172.17.0.0/24' \
   SERVICE_NODE_PORT_RANGE='30000-32767' \
   CLUSTER_CIDR='172.16.0.0/16' \

From fe14b052c6956c7341b0699ec62c8e218a7e406d Mon Sep 17 00:00:00 2001
From: Ricardo Rosales <728243+missingcharacter@users.noreply.github.com>
Date: Wed, 6 Dec 2023 23:08:58 -0600
Subject: [PATCH 2/2] [~] [setup.sh] Added UBUNTU_VERSION and changed `--mem`
 to `--memory`

---
 setup.sh       | 3 ++-
 tests/tests.sh | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/setup.sh b/setup.sh
index e3f0747..a879f2e 100755
--- a/setup.sh
+++ b/setup.sh
@@ -40,6 +40,7 @@ export \
   CNI_PLUGINS_VERSION='1.4.0' \
   COREDNS_CHART_VERSION='1.28.2' \
   CILIUM_CHART_VERSION='1.14.4' \
+  UBUNTU_VERSION='22.04' \
   SERVICE_CLUSTER_IP_RANGE='172.17.0.0/24' \
   SERVICE_NODE_PORT_RANGE='30000-32767' \
   CLUSTER_CIDR='172.16.0.0/16' \
@@ -55,7 +56,7 @@ KUBE_API_CLUSTER_IP="$(ipcalc "${SERVICE_CLUSTER_IP_RANGE}" | grep 'HostMin' | a
 msg_info 'Creating multipass instances'
 
 for i in 'controller-k8s' 'worker-1-k8s' 'worker-2-k8s' ; do
-  multipass launch --name "${i}" --cpus 2 --mem 2048M --disk 11G 22.04
+  multipass launch --name "${i}" --cpus 2 --memory 2048M --disk 11G "${UBUNTU_VERSION}"
 done
 
 msg_info 'Creating and distributing certificates'
diff --git a/tests/tests.sh b/tests/tests.sh
index f857955..4c9271e 100755
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -20,7 +20,7 @@ if ! grep -q 'aescbc' <<<"${ETCD_OUTPUT=}"; then
   msg_fatal "Kubernetes secret is not encrypted"
 fi
 
-msg_info "Deplotying nginx"
+msg_info "Deploying nginx"
 kubectl create deployment nginx --image=nginx
 until grep -q 'true' <(grep 'nginx' <(kubectl get pods -o json -A | jq -r '.items[] | .status.containerStatuses[]? | [.name, .ready|tostring] |join(":")')); do
   echo "Pod nginx is not ready yet, will wait 2 seconds"