🔨 chore: final cleanup

Signed-off-by: dyn <oss+dyn@xtrm.me>

bonus/confs/argocd-app.yml

@@ -6,7 +6,7 @@ metadata:
 spec:
   project: default
   source:
-    repoURL: http://gitlab-webservice-default.gitlab.svc.cluster.local:8080/root/vvaas42.git
+    repoURL: http://gitlab-webservice-default.default.svc.cluster.local:8181/root/iot.git
     targetRevision: HEAD
     path: '.'
   destination:

bonus/scripts/argo-install.sh

@@ -8,7 +8,7 @@ if [ -z "$KUBECONFIG" ]; then
   exit 1
 fi
 
-# set -x
+set -x
 
 ### === Initial K3D Setup ===
 k3d cluster create inception-of-things
@@ -28,30 +28,12 @@ echo "> ArgoCD is starting (this takes around ~6 minutes)..."
 kubectl wait --namespace argocd \
   --for=condition=ready pod \
   --selector=app.kubernetes.io/name=argocd-server \
-  --timeout=300s \
-  1>/dev/null 2>/dev/null
-echo '> Starting watch...'
-sleep 5
-
-# So we have a progress-ish indicator visual
-while true; do
-  ready=$(kubectl get pods -n argocd --no-headers 2>/dev/null | grep -E "([0-9]+)/\1" | wc -l)
-  total=$(kubectl get pods -n argocd --no-headers 2>/dev/null | wc -l)
-
-  clear
-  kubectl get pods -n argocd
-  
-  if [ "$ready" -eq "$total" ] && [ "$total" -gt 0 ]; then
-    break
-  fi
-  
-  sleep 30
-done
+  --timeout=300s
 
 echo "ArgoCD is ready!"
 echo '> To setup port-forwarding, run:'
 echo '>   kubectl port-forward -n argocd svc/argocd-server 8080:443'
-kubectl port-forward -n argocd svc/argocd-server 8080:443 1>/dev/null 2>/dev/null &
+#kubectl port-forward -n argocd svc/argocd-server 8080:443 1>/dev/null 2>/dev/null &
 
 #TODO: The app will be imported via Gitlab, don't import it here
 # so we don't have 2 of the same deployment.
@@ -105,7 +87,8 @@ echo
 echo '> To setup port-forwarding, run:'
 echo '>   kubectl port-forward -n gitlab svc/gitlab-webservice-default 8081:8181'
 
-kubectl port-forward -n gitlab svc/gitlab-webservice-default 8081:8181 1>/dev/null 2>/dev/null &
+#kubectl port-forward -n gitlab svc/gitlab-webservice-default 8081:8181 1>/dev/null 2>/dev/null &
+
 ### === Setup /etc/hosts ===
 function add_host() {
 	local ip=$1

vm/install-tools.sh

@@ -15,6 +15,7 @@ sudo rm -f ./get-docker.sh
 sudo sh -c 'wget -O- https://www.virtualbox.org/download/oracle_vbox_2016.asc | gpg --yes --output /usr/share/keyrings/oracle-virtualbox-2016.gpg --dearmor'
 echo "deb [arch=amd64 signed-by=/usr/share/keyrings/oracle-virtualbox-2016.gpg] http://download.virtualbox.org/virtualbox/debian $(lsb_release -sc) contrib" | sudo tee /etc/apt/sources.list.d/virtualbox.list
 sudo apt update
+sudo apt install virtualbox-7.1 -y
 
 wget -O - https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg
 echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(grep -oP '(?<=UBUNTU_CODENAME=).*' /etc/os-release || lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list