adjusted bootstrap scripts to have well-defined lb vs ingress

groups/loadbalance

@@ -0,0 +1 @@
+apollo

kubes/ingress/tolerations.yaml

@@ -1,14 +1,14 @@
 controller:
   tolerations:
     - effect: NoSchedule
-      key: compute
+      key: ingress 
   admissionWebhooks:
     patch:
       tolerations:
       - effect: NoSchedule
-        key: compute
+        key: ingress 
 
 defaultBackend:
   tolerations:
   - effect: NoSchedule
-    key: compute
+    key: ingress 

kubes/metallb/loadbalancer.yaml

@@ -1853,7 +1853,7 @@ spec:
         key: node-role.kubernetes.io/control-plane
         operator: Exists
       - effect: NoSchedule
-        key: compute
+        key: loadbalance 
       volumes:
       - name: memberlist
         secret:

scripts/preseed/autoinstaller-generate.sh

@@ -289,7 +289,7 @@ fi
 
 log "📦 Repackaging extracted files into an ISO image..."
 cd "$tmpdir"
-xorriso -as mkisofs -r -V 'Ubuntu-Server 24.04.1 LTS amd64' --modification-date='2024091107542800' --grub2-mbr --interval:local_fs:0s-15s:zero_mbrpt,zero_gpt:'/home/dtookey/infra/build/ubuntu-original-2024-09-11.iso' --protective-msdos-label -partition_cyl_align off -partition_offset 16 --mbr-force-bootable -append_partition 2 28732ac11ff8d211ba4b00a0c93ec93b --interval:local_fs:5526876d-5537019d::'/home/dtookey/infra/build/ubuntu-original-2024-09-11.iso' -appended_part_as_gpt -iso_mbr_part_type a2a0d0ebe5b9334487c068b6b72699c7 -c '/boot.catalog' -b '/boot/grub/i386-pc/eltorito.img' -no-emul-boot -boot-load-size 4 -boot-info-table --grub2-boot-info -eltorito-alt-boot -e '--interval:appended_partition_2_start_1381719s_size_10144d:all::' -no-emul-boot -boot-load-size 10144 -o "${destination_iso}" . #&>/dev/null
+xorriso -as mkisofs -r -V 'Ubuntu-Server 24.04.1 LTS amd64' --modification-date='2024091107542800' --grub2-mbr --interval:local_fs:0s-15s:zero_mbrpt,zero_gpt:'/home/dtookey/infra/build/ubuntu-original-2024-09-12.iso' --protective-msdos-label -partition_cyl_align off -partition_offset 16 --mbr-force-bootable -append_partition 2 28732ac11ff8d211ba4b00a0c93ec93b --interval:local_fs:5526876d-5537019d::'/home/dtookey/infra/build/ubuntu-original-2024-09-12.iso' -appended_part_as_gpt -iso_mbr_part_type a2a0d0ebe5b9334487c068b6b72699c7 -c '/boot.catalog' -b '/boot/grub/i386-pc/eltorito.img' -no-emul-boot -boot-load-size 4 -boot-info-table --grub2-boot-info -eltorito-alt-boot -e '--interval:appended_partition_2_start_1381719s_size_10144d:all::' -no-emul-boot -boot-load-size 10144 -o "${destination_iso}" . #&>/dev/null
 
 
 cd "$OLDPWD"

scripts/setup/0-install_kubes.sh

@@ -17,10 +17,11 @@ ssh -t ares "echo \"virgil ALL=(ALL) NOPASSWD:ALL\" | sudo tee /etc/sudoers.d/pa
 ssh ares "echo \"ares checked in\""
 
 ssh -t artemis "echo \"virgil ALL=(ALL) NOPASSWD:ALL\" | sudo tee /etc/sudoers.d/passwordless > /dev/null"
-ssh artemis "sudo sed -i -e 's/#HandleLidSwitch=suspend/HandleLidSwitch=ignore/g' /etc/systemd/logind.conf"
-ssh artemis "sudo systemctl restart systemd-logind.service"
 ssh artemis "echo \"artemis checked in\""
 
+ssh -t apollo "echo \"virgil ALL=(ALL) NOPASSWD:ALL\" | sudo tee /etc/sudoers.d/passwordless > /dev/null"
+ssh apollo "echo \"artemis checked in\""
+
 ssh cupid1 "echo \"cupid1 checked in\""
 ssh cupid2 "echo \"cupid2 checked in\""
 ssh cupid3 "echo \"cupid3 checked in\""

scripts/setup/1-finish-config.sh

@@ -17,7 +17,9 @@ if [ -z $JTOKEN ]; then
 fi
 
 parallel -a groups/workers ./scripts/setup/kube_worker.sh -n {} -r worker -t $JTOKEN
-parallel -a groups/compute ./scripts/setup/kube_worker.sh -n {} -r compute -t $JTOKEN
+parallel -a groups/compute ./scripts/setup/kube_worker.sh -n {} -r ingress -t $JTOKEN
+parallel -a groups/compute ./scripts/setup/kube_worker.sh -n {} -r loadbalance -t $JTOKEN
+
 
 echo "Waiting for 30s for the new pods to settle"
 sleep 10

ubuntu/bootstrap-ubuntu.sh

@@ -24,6 +24,7 @@ if [ -z "$(which docker)" ]; then
   # Add the repository to Apt sources:
   echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu noble stable" | \
   tee /etc/apt/sources.list.d/docker.list > /dev/null
+
   apt-get update
   apt-get install -y docker-ce docker-ce-cli containerd.io apt-transport-https
   usermod -aG docker ${USER_NAME}
@@ -81,3 +82,7 @@ systemctl enable kubelet && systemctl start kubelet
 
 kubeadm config images pull
 fi
+
+
+apt-get upgrade -y
+apt-get autoremove -y

ubuntu/user-data.apollo.yaml

@@ -24,7 +24,7 @@ autoinstall:
     layout:
       name: lvm
       match:
-        size: smallest
+        path: /dev/sda 
       sizing-policy: scaled
     config:
       - type: partition
@@ -33,16 +33,7 @@ autoinstall:
         size: 1G
       - type: partition
         id: root-partition
-        size: 25G
-  storage:
-    layout:
-      name: lvm
-      match:
-        size: largest
-    config:
-      - type: partition
-        id: data-partition
-        size: 256G
+        size: 100G
   network:
     version: 2
     renderer: networkd

ubuntu/user-data.artemis.yaml

@@ -24,7 +24,7 @@ autoinstall:
     layout:
       name: lvm
       match:
-        size: smallest
+        path: /dev/sda
       sizing-policy: scaled
     config:
       - type: partition
@@ -33,17 +33,7 @@ autoinstall:
         size: 1G
       - type: partition
         id: root-partition
-        size: 25G
-  storage:
-    layout:
-      name: lvm
-      match:
-        size: largest
-        model: CT*
-    config:
-      - type: partition
-        id: data-partition
-        size: 256G
+        size: 100G
   network:
     version: 2
     renderer: networkd