[~] [setup.sh] Added UBUNTU_VERSION and changed --mem to --memory

missingcharacter · Dec 7, 2023 · fe14b05 · fe14b05
1 parent b592b96
commit fe14b05
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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"