From 8c9ad776863e8631ebcccbf4aaecc6b01999d9aa Mon Sep 17 00:00:00 2001 From: dyn Date: Wed, 17 Dec 2025 14:12:03 +0100 Subject: [PATCH 1/5] =?UTF-8?q?=F0=9F=90=9B=20fix(p3):=20higher=20metrics-?= =?UTF-8?q?server=20wait=20timeout?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: dyn --- p3/scripts/argo-install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/p3/scripts/argo-install.sh b/p3/scripts/argo-install.sh index 9f3ac29..0f69b15 100755 --- a/p3/scripts/argo-install.sh +++ b/p3/scripts/argo-install.sh @@ -7,13 +7,13 @@ kubectl apply -f https://github.com/kubernetes-sigs/metrics-server/releases/late kubectl patch deployment metrics-server -n kube-system --type='json' \ -p='[{"op": "add", "path": "/spec/template/spec/containers/0/args/-", "value": "--kubelet-insecure-tls"}]' -echo '> Waiting for metrics-server to be ready...' -kubectl wait --for=condition=available deployment/metrics-server -n kube-system --timeout=300s +echo '> metrics-server is starting (this takes around ~3 minutes)...' +kubectl wait --for=condition=available deployment/metrics-server -n kube-system --timeout=500s kubectl create namespace argocd kubectl apply -n argocd -f https://raw.githubusercontent.com/argoproj/argo-cd/stable/manifests/install.yaml -echo "> ArgoCD is starting (this takes around ~5 minutes)..." +echo "> ArgoCD is starting (this takes around ~6 minutes)..." sleep 10 echo '> Starting watch...' sleep 5 From edc99ce6dcac9cc75f0eebbb7246b8a5c241b76e Mon Sep 17 00:00:00 2001 From: dyn Date: Wed, 17 Dec 2025 14:18:56 +0100 Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=94=A8=20chore:=20cleanup=20the=20nix?= =?UTF-8?q?os=20config,=20add=20auto-copying=20of=20/iot?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: dyn --- vm/configuration.nix | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/vm/configuration.nix b/vm/configuration.nix index 3adeb79..ffeb5a6 100644 --- a/vm/configuration.nix +++ b/vm/configuration.nix @@ -26,6 +26,15 @@ script = '' mkdir -p /iot /run/wrappers/bin/mount -t 9p -o trans=virtio,version=9p2000.L host0 /iot + + rm -rf /home/user/iot /root/iot + + mkdir /home/user/iot -p + cp -r /iot/p* /iot/bonus /home/user/iot/ + chown -R user:user /home/user/iot + + mkdir /root/iot -p + cp -r /iot/p* /iot/bonus /rot/iot/ ''; wantedBy = [ "multi-user.target" ]; @@ -47,19 +56,8 @@ }; services = { - k3s = { - enable = true; - }; + k3s.enable = true; getty.autologinUser = "root"; - openssh = { - enable = true; - ports = [ 22 ]; - settings = { - PermitRootLogin = "yes"; - PasswordAuthentication = true; - AllowUsers = null; - }; - }; xserver = { enable = true; xkb = { @@ -81,15 +79,19 @@ enable = true; enable32Bit = true; }; - virtualisation.docker.enable = true; + + virtualisation = { + virtualbox.host.enable = true; + docker.enable = true; + }; boot.kernelParams = [ "kvm.enable_virt_at_load=0" ]; programs = { zsh = { - autosuggestions.enable = true; - syntaxHighlighting.enable = true; enable = true; enableBashCompletion = true; + autosuggestions.enable = true; + syntaxHighlighting.enable = true; shellAliases = (import ./aliases.nix); }; }; From a34f255eef7bf6dc4b0a8389f728c111d595e83f Mon Sep 17 00:00:00 2001 From: dyn Date: Wed, 17 Dec 2025 14:20:51 +0100 Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=94=A8=20chore(vm):=20remove=20tcp=20?= =?UTF-8?q?forwarding?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: dyn --- vm/flake.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/vm/flake.nix b/vm/flake.nix index 09c863b..227fd8a 100644 --- a/vm/flake.nix +++ b/vm/flake.nix @@ -84,7 +84,6 @@ -m 4G \ -smp 1 \ -cpu host \ - -netdev user,id=net0,hostfwd=tcp::2222-:22 \ -virtfs local,path=$(${pkgs.coreutils}/bin/pwd)/..,mount_tag=host0,security_model=mapped-xattr,id=host0 ''; in From a7aaaf4d7d6c84eba6d1af9e1f389d2b503f0956 Mon Sep 17 00:00:00 2001 From: dyn Date: Wed, 17 Dec 2025 14:52:05 +0100 Subject: [PATCH 4/5] =?UTF-8?q?=F0=9F=90=9B=20fix(p3):=20final=20fix=20on?= =?UTF-8?q?=20this=20bs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: dyn --- p3/scripts/argo-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/p3/scripts/argo-install.sh b/p3/scripts/argo-install.sh index 0f69b15..b4a3546 100755 --- a/p3/scripts/argo-install.sh +++ b/p3/scripts/argo-install.sh @@ -44,7 +44,7 @@ echo '> App is starting (this takes around ~30 seconds)...' kubectl wait --namespace dev \ --for=condition=ready pod \ - --selector=app.kubernetes.io/name=app-deployment \ + --selector=app=app-p3 \ --timeout=300s echo 'App imported in ArgoCD' sleep 10 From 6b0353123bcbd0794cae38c3c5006b0e17a76032 Mon Sep 17 00:00:00 2001 From: dyn Date: Wed, 17 Dec 2025 14:54:59 +0100 Subject: [PATCH 5/5] =?UTF-8?q?=F0=9F=90=9B=20fix(p3):=20re-add=20port-for?= =?UTF-8?q?warding?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: dyn --- p3/scripts/argo-install.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/p3/scripts/argo-install.sh b/p3/scripts/argo-install.sh index b4a3546..253af71 100755 --- a/p3/scripts/argo-install.sh +++ b/p3/scripts/argo-install.sh @@ -63,3 +63,5 @@ echo Username: admin echo -n "Password: " kubectl -n argocd get secret argocd-initial-admin-secret -o jsonpath="{.data.password}" | base64 -d echo "===============================" + +kubectl port-forward svc/argocd-server -n argocd 8080:443