From c449e15879ddfebd48ed1046320b80b3d7bf8751 Mon Sep 17 00:00:00 2001
From: adjoly <contact@adjoly.fr>
Date: Tue, 19 Aug 2025 11:50:38 +0200
Subject: [PATCH] =?UTF-8?q?=E3=80=8C=E2=9C=A8=E3=80=8D=20feat:=20working?=
 =?UTF-8?q?=20p1=20(i=20thinkl)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore        |  1 +
 p1/Vagrantfile    |  4 ++--
 p1/install-all.sh | 33 ++++++++++++++++++---------------
 p1/setup-S.sh     | 22 ++++------------------
 p1/setup-SW.sh    | 20 +++++---------------
 5 files changed, 30 insertions(+), 50 deletions(-)

diff --git a/.gitignore b/.gitignore
index 16b5d5a..18e50c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ iot-box.qcow2
 
 .env
 
+p1/node-token
diff --git a/p1/Vagrantfile b/p1/Vagrantfile
index 73251df..b50bb3d 100644
--- a/p1/Vagrantfile
+++ b/p1/Vagrantfile
@@ -36,7 +36,7 @@ Vagrant.configure("2") do |config|
     server.vm.network "private_network", ip: "192.168.56.110", auto_config: true
     
     server.vm.provision "shell", path: "install-all.sh"
-    # server.vm.provision "shell", path: "setup-S.sh"
+    server.vm.provision "shell", path: "setup-S.sh"
   end
 
   config.vm.define "#{IOT_LOGIN}SW" do |serverworker|
@@ -44,6 +44,6 @@ Vagrant.configure("2") do |config|
     serverworker.vm.network "private_network", ip: "192.168.56.111", auto_config: true
 
     serverworker.vm.provision "shell", path: "install-all.sh"
-    # serverworker.vm.provision "shell", path: "setup-SW.sh"
+    serverworker.vm.provision "shell", path: "setup-SW.sh"
   end
 end
diff --git a/p1/install-all.sh b/p1/install-all.sh
index 8c94bfe..004683a 100644
--- a/p1/install-all.sh
+++ b/p1/install-all.sh
@@ -1,18 +1,21 @@
 #!/usr/bin/env sh
 
-# setup docker
+# # setup docker
+# sudo apt update
+# sudo apt install -y docker.io
+#
+# sudo systemctl start docker
+# sudo systemctl enable docker
+#
+# # install kubernetes
+# sudo apt-get install -y apt-transport-https ca-certificates curl gpg
+# curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.33/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg
+# echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.33/deb/ /' | sudo tee /etc/apt/sources.list.d/kubernetes.list
+#
+# sudo apt-get update
+# sudo apt-get install -y kubelet kubectl
+# sudo apt-mark hold kubelet kubectl
+# sudo systemctl enable --now kubelet
+#
 sudo apt update
-sudo apt install -y docker.io
-
-sudo systemctl start docker
-sudo systemctl enable docker
-
-# install kubernetes
-sudo apt-get install -y apt-transport-https ca-certificates curl gpg
-curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.33/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg
-echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.33/deb/ /' | sudo tee /etc/apt/sources.list.d/kubernetes.list
-
-sudo apt-get update
-sudo apt-get install -y kubelet kubectl
-sudo apt-mark hold kubelet kubectl
-sudo systemctl enable --now kubelet
+sudo apt install curl -y
diff --git a/p1/setup-S.sh b/p1/setup-S.sh
index 8c01c00..646e6d6 100644
--- a/p1/setup-S.sh
+++ b/p1/setup-S.sh
@@ -1,18 +1,4 @@
-#!/usr/bin/env sh
-
-# setup docker
-sudo apt update
-sudo apt install -y docker.io
-
-sudo systemctl start docker
-sudo systemctl enable docker
-
-# install kubernetes
-sudo apt-get install -y apt-transport-https ca-certificates curl gpg
-curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.33/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg
-echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.33/deb/ /' | sudo tee /etc/apt/sources.list.d/kubernetes.list
-
-sudo apt-get update
-sudo apt-get install -y kubelet kubeadm kubectl
-sudo apt-mark hold kubelet kubeadm kubectl
-sudo systemctl enable --now kubelet
+echo "Launching k3s install"
+curl -sfL https://get.k3s.io | sh -s - --node-ip=192.168.56.110
+echo "Copying token"
+sudo cat /var/lib/rancher/k3s/server/node-token > /vagrant/node-token
diff --git a/p1/setup-SW.sh b/p1/setup-SW.sh
index 8c01c00..f46315a 100644
--- a/p1/setup-SW.sh
+++ b/p1/setup-SW.sh
@@ -1,18 +1,8 @@
 #!/usr/bin/env sh
 
-# setup docker
-sudo apt update
-sudo apt install -y docker.io
+while [ ! -f /vagrant/node-token ];
+    do sleep 2;
+done
 
-sudo systemctl start docker
-sudo systemctl enable docker
-
-# install kubernetes
-sudo apt-get install -y apt-transport-https ca-certificates curl gpg
-curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.33/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg
-echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.33/deb/ /' | sudo tee /etc/apt/sources.list.d/kubernetes.list
-
-sudo apt-get update
-sudo apt-get install -y kubelet kubeadm kubectl
-sudo apt-mark hold kubelet kubeadm kubectl
-sudo systemctl enable --now kubelet
+TOKEN=$(cat /vagrant/node-token)
+curl -sfL https://get.k3s.io | K3S_URL=https://192.168.56.110:6443 K3S_TOKEN=$TOKEN sh -s - --node-ip=192.168.56.111