From 44597a755d1b7b38e36482d683a39392ec597681 Mon Sep 17 00:00:00 2001
From: Alex <alex@central.nu>
Date: Wed, 3 Sep 2025 13:59:44 +0200
Subject: [PATCH] fixes

---
 create-ubuntu-cloudinit-template.sh    |   2 +-
 flake.nix                              |   4 +
 infrastructure-admin/main.tf           |  72 ++-
 infrastructure-admin/outputs.tf        |   2 +-
 infrastructure-admin/terraform.tfstate | 681 -------------------------
 infrastructure-admin/terraform.tfvars  |   3 +
 infrastructure-admin/variables.tf      |   6 +
 7 files changed, 69 insertions(+), 701 deletions(-)
 delete mode 100644 infrastructure-admin/terraform.tfstate

diff --git a/create-ubuntu-cloudinit-template.sh b/create-ubuntu-cloudinit-template.sh
index 9f7ab7f..e9b33d5 100644
--- a/create-ubuntu-cloudinit-template.sh
+++ b/create-ubuntu-cloudinit-template.sh
@@ -8,7 +8,7 @@ VMID=9000
 VM_NAME="ubuntu-22.04-cloudinit"
 MEMORY=2048
 CORES=2
-STORAGE="local-lvm"      # Change if using different storage
+STORAGE="local-lvm"
 BRIDGE="vmbr0"
 IMG_URL="https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img"
 IMG_FILE="/tmp/jammy-server-cloudimg-amd64.img"
diff --git a/flake.nix b/flake.nix
index 59a8085..432e4b9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,6 +15,10 @@
       pkgs.mkShell {
         buildInputs = with pkgs; [
           terraform
+          cdrtools
+          kubectl
+          openlens
+          kubernetes-helm
         ];
       };
   };
diff --git a/infrastructure-admin/main.tf b/infrastructure-admin/main.tf
index d8ed433..f2072e0 100644
--- a/infrastructure-admin/main.tf
+++ b/infrastructure-admin/main.tf
@@ -48,11 +48,22 @@ resource "proxmox_vm_qemu" "controller" {
   }
   memory      = 1024
   scsihw      = "virtio-scsi-pci"
-  disk {
-    slot    = "scsi0"
-    size    = "20G"
-    storage = var.storage
-    type    = "disk"
+  disks {
+    scsi {
+      scsi0 {
+        disk {
+          storage = var.storage
+          size    = "20G" 
+        }
+      }
+    }
+    ide {
+      ide1 {
+        cloudinit {
+          storage = var.storage
+        }
+      }
+    }
   }
   network {
     id     = 0
@@ -60,7 +71,8 @@ resource "proxmox_vm_qemu" "controller" {
     bridge = var.bridge
   }
   ipconfig0 = "ip=${var.controller_ip}/${var.netmask},gw=${var.gateway}"
-  ciuser = "ubuntu"
+  ciuser = var.admin_user
+  cipassword = var.admin_password
   sshkeys = var.ssh_public_key
 
   cicustom = <<EOT
@@ -88,11 +100,22 @@ resource "proxmox_vm_qemu" "worker1" {
   }
   memory      = 1024
   scsihw      = "virtio-scsi-pci"
-  disk {
-    slot    = "scsi0"
-    size    = "20G"
-    storage = var.storage
-    type    = "disk"
+  disks {
+    scsi {
+      scsi0 {
+        disk {
+          storage = var.storage
+          size    = "20G" 
+        }
+      }
+    }
+    ide {
+      ide1 {
+        cloudinit {
+          storage = var.storage
+        }
+      }
+    }
   }
   network {
     id     = 0
@@ -100,7 +123,8 @@ resource "proxmox_vm_qemu" "worker1" {
     bridge = var.bridge
   }
   ipconfig0 = "ip=${var.worker1_ip}/${var.netmask},gw=${var.gateway}"
-  ciuser = "ubuntu"
+  ciuser = var.admin_user
+  cipassword = var.admin_password
   sshkeys = var.ssh_public_key
 
   cicustom = <<EOT
@@ -128,11 +152,22 @@ resource "proxmox_vm_qemu" "worker2" {
   }
   memory      = 1024
   scsihw      = "virtio-scsi-pci"
-  disk {
-    slot    = "scsi0"
-    size    = "20G"
-    storage = var.storage
-    type    = "disk"
+  disks {
+    scsi {
+      scsi0 {
+        disk {
+          storage = var.storage
+          size    = "20G" 
+        }
+      }
+    }
+    ide {
+      ide1 {
+        cloudinit {
+          storage = var.storage
+        }
+      }
+    }
   }
   network {
     id     = 0
@@ -140,7 +175,8 @@ resource "proxmox_vm_qemu" "worker2" {
     bridge = var.bridge
   }
   ipconfig0 = "ip=${var.worker2_ip}/${var.netmask},gw=${var.gateway}"
-  ciuser = "ubuntu"
+  ciuser = var.admin_user
+  cipassword = var.admin_password
   sshkeys = var.ssh_public_key
 
   cicustom = <<EOT
diff --git a/infrastructure-admin/outputs.tf b/infrastructure-admin/outputs.tf
index ae15e0a..ddd60ee 100644
--- a/infrastructure-admin/outputs.tf
+++ b/infrastructure-admin/outputs.tf
@@ -8,4 +8,4 @@ output "worker1_ip" {
 
 output "worker2_ip" {
   value = var.worker2_ip
-}
+}
\ No newline at end of file
diff --git a/infrastructure-admin/terraform.tfstate b/infrastructure-admin/terraform.tfstate
deleted file mode 100644
index cf828c5..0000000
--- a/infrastructure-admin/terraform.tfstate
+++ /dev/null
@@ -1,681 +0,0 @@
-{
-  "version": 4,
-  "terraform_version": "1.13.0",
-  "serial": 7,
-  "lineage": "b0d31962-3163-dc87-e1a4-b069868f1866",
-  "outputs": {
-    "controller_ip": {
-      "value": "192.168.122.50",
-      "type": "string"
-    },
-    "worker1_ip": {
-      "value": "192.168.122.51",
-      "type": "string"
-    },
-    "worker2_ip": {
-      "value": "192.168.122.52",
-      "type": "string"
-    }
-  },
-  "resources": [
-    {
-      "mode": "managed",
-      "type": "proxmox_vm_qemu",
-      "name": "controller",
-      "provider": "provider[\"registry.terraform.io/telmate/proxmox\"]",
-      "instances": [
-        {
-          "schema_version": 0,
-          "attributes": {
-            "additional_wait": 5,
-            "agent": 0,
-            "agent_timeout": 90,
-            "args": "",
-            "automatic_reboot": true,
-            "balloon": 0,
-            "bios": "seabios",
-            "boot": "c",
-            "bootdisk": "scsi0",
-            "ci_wait": null,
-            "cicustom": null,
-            "cipassword": "",
-            "ciupgrade": false,
-            "ciuser": "ubuntu",
-            "clone": null,
-            "clone_id": 9000,
-            "clone_wait": 10,
-            "cores": 0,
-            "cpu": [
-              {
-                "affinity": "",
-                "cores": 2,
-                "flags": [],
-                "limit": 0,
-                "numa": false,
-                "sockets": 1,
-                "type": "host",
-                "units": 0,
-                "vcores": 0
-              }
-            ],
-            "cpu_type": "",
-            "current_node": "pve",
-            "default_ipv4_address": "",
-            "default_ipv6_address": "",
-            "define_connection_info": true,
-            "desc": null,
-            "description": "Managed by Terraform.",
-            "disk": [
-              {
-                "asyncio": "",
-                "backup": true,
-                "cache": "",
-                "discard": false,
-                "disk_file": "",
-                "emulatessd": false,
-                "format": "raw",
-                "id": 0,
-                "iops_r_burst": 0,
-                "iops_r_burst_length": 0,
-                "iops_r_concurrent": 0,
-                "iops_wr_burst": 0,
-                "iops_wr_burst_length": 0,
-                "iops_wr_concurrent": 0,
-                "iothread": false,
-                "iso": "",
-                "linked_disk_id": -1,
-                "mbps_r_burst": 0,
-                "mbps_r_concurrent": 0,
-                "mbps_wr_burst": 0,
-                "mbps_wr_concurrent": 0,
-                "passthrough": false,
-                "readonly": false,
-                "replicate": false,
-                "serial": "",
-                "size": "20G",
-                "slot": "scsi0",
-                "storage": "local-lvm",
-                "type": "disk",
-                "wwn": ""
-              }
-            ],
-            "disks": [],
-            "efidisk": [],
-            "force_create": false,
-            "force_recreate_on_change_of": null,
-            "full_clone": true,
-            "hagroup": "",
-            "hastate": "",
-            "hostpci": [],
-            "hotplug": "network,disk,usb",
-            "id": "pve/qemu/102",
-            "ipconfig0": "ip=192.168.122.50/24,gw=192.168.122.1",
-            "ipconfig1": null,
-            "ipconfig10": null,
-            "ipconfig11": null,
-            "ipconfig12": null,
-            "ipconfig13": null,
-            "ipconfig14": null,
-            "ipconfig15": null,
-            "ipconfig2": null,
-            "ipconfig3": null,
-            "ipconfig4": null,
-            "ipconfig5": null,
-            "ipconfig6": null,
-            "ipconfig7": null,
-            "ipconfig8": null,
-            "ipconfig9": null,
-            "kvm": true,
-            "linked_vmid": 0,
-            "machine": "",
-            "memory": 1024,
-            "name": "k3s-controller",
-            "nameserver": null,
-            "network": [
-              {
-                "bridge": "vmbr0",
-                "firewall": false,
-                "id": 0,
-                "link_down": false,
-                "macaddr": "bc:24:11:af:0a:20",
-                "model": "virtio",
-                "mtu": 0,
-                "queues": 0,
-                "rate": 0,
-                "tag": 0
-              }
-            ],
-            "numa": false,
-            "onboot": false,
-            "os_network_config": null,
-            "os_type": null,
-            "pci": [],
-            "pcis": [],
-            "pool": "",
-            "protection": false,
-            "pxe": null,
-            "qemu_os": "other",
-            "reboot_required": false,
-            "rng": [],
-            "scsihw": "virtio-scsi-pci",
-            "searchdomain": null,
-            "serial": [],
-            "skip_ipv4": false,
-            "skip_ipv6": false,
-            "smbios": [
-              {
-                "family": "",
-                "manufacturer": "",
-                "product": "",
-                "serial": "",
-                "sku": "",
-                "uuid": "3c948be5-2495-4910-ba95-519413eb6392",
-                "version": ""
-              }
-            ],
-            "sockets": 0,
-            "ssh_forward_ip": null,
-            "ssh_host": "",
-            "ssh_port": "22",
-            "ssh_private_key": null,
-            "ssh_user": null,
-            "sshkeys": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDFJXEiOlfpKVRYpKvD7e3MlCv+8I0wR9Ed6dPzkCH/0sdUya6cS2Cyh69ctw94CZZ35d0ahhbiDphe8Dz4KeWOdP9WcgG+88JhOEQBiz3tqXT4sP9a2jitdyCkLNnqkrcz9WokC/l8M/RbmFrMJxBhnE5xq++5CcOq/CPxIqtgTiCb6w0R+QxAtjB6jrZ8iuDujmeDHtts+TJ9iDDaS+vckkM5g4M8fprP1/CHIM4rQH2kD8LPy8XLUlPgr3hpJq+FH/2k7dxd7yYUdQG/CYr31x2NfYPAArgosmZHVPttjGljkS5IPr1WDBugXBMian5Oi/7iYE1pRo73NJTarFdfvegTz+emZbOId5O50LofZY7eacGD2XOiN995wStXYUlINjHVCARERk2JCCKoiCaR49aGTala6h2RspkumK46kMvUsrhSPhUu19z8phqYnohEKgmJJfpZeRIFAfZzsX47acAW4MzyJhDFPo53PRKn34sqL1SnL0plqfACeKJbhz8= alex@camulodunum\n",
-            "startup": "",
-            "tablet": true,
-            "tags": " ",
-            "target_node": "pve",
-            "target_nodes": null,
-            "timeouts": null,
-            "tpm_state": [],
-            "unused_disk": [],
-            "usb": [],
-            "usbs": [],
-            "vcpus": 0,
-            "vga": [],
-            "vm_state": "running",
-            "vmid": 102
-          },
-          "sensitive_attributes": [
-            [
-              {
-                "type": "get_attr",
-                "value": "cicustom"
-              }
-            ],
-            [
-              {
-                "type": "get_attr",
-                "value": "cipassword"
-              }
-            ],
-            [
-              {
-                "type": "get_attr",
-                "value": "ssh_private_key"
-              }
-            ]
-          ],
-          "identity_schema_version": 0,
-          "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxMjAwMDAwMDAwMDAwLCJkZWZhdWx0IjoxMjAwMDAwMDAwMDAwLCJkZWxldGUiOjEyMDAwMDAwMDAwMDAsInJlYWQiOjEyMDAwMDAwMDAwMDAsInVwZGF0ZSI6MTIwMDAwMDAwMDAwMH19",
-          "dependencies": [
-            "random_password.k3s_token"
-          ]
-        }
-      ]
-    },
-    {
-      "mode": "managed",
-      "type": "proxmox_vm_qemu",
-      "name": "worker1",
-      "provider": "provider[\"registry.terraform.io/telmate/proxmox\"]",
-      "instances": [
-        {
-          "schema_version": 0,
-          "attributes": {
-            "additional_wait": 5,
-            "agent": 0,
-            "agent_timeout": 90,
-            "args": "",
-            "automatic_reboot": true,
-            "balloon": 0,
-            "bios": "seabios",
-            "boot": "c",
-            "bootdisk": "scsi0",
-            "ci_wait": null,
-            "cicustom": null,
-            "cipassword": "",
-            "ciupgrade": false,
-            "ciuser": "ubuntu",
-            "clone": null,
-            "clone_id": 9000,
-            "clone_wait": 10,
-            "cores": 0,
-            "cpu": [
-              {
-                "affinity": "",
-                "cores": 2,
-                "flags": [],
-                "limit": 0,
-                "numa": false,
-                "sockets": 1,
-                "type": "host",
-                "units": 0,
-                "vcores": 0
-              }
-            ],
-            "cpu_type": "",
-            "current_node": "pve",
-            "default_ipv4_address": "",
-            "default_ipv6_address": "",
-            "define_connection_info": true,
-            "desc": null,
-            "description": "Managed by Terraform.",
-            "disk": [
-              {
-                "asyncio": "",
-                "backup": true,
-                "cache": "",
-                "discard": false,
-                "disk_file": "",
-                "emulatessd": false,
-                "format": "raw",
-                "id": 0,
-                "iops_r_burst": 0,
-                "iops_r_burst_length": 0,
-                "iops_r_concurrent": 0,
-                "iops_wr_burst": 0,
-                "iops_wr_burst_length": 0,
-                "iops_wr_concurrent": 0,
-                "iothread": false,
-                "iso": "",
-                "linked_disk_id": -1,
-                "mbps_r_burst": 0,
-                "mbps_r_concurrent": 0,
-                "mbps_wr_burst": 0,
-                "mbps_wr_concurrent": 0,
-                "passthrough": false,
-                "readonly": false,
-                "replicate": false,
-                "serial": "",
-                "size": "20G",
-                "slot": "scsi0",
-                "storage": "local-lvm",
-                "type": "disk",
-                "wwn": ""
-              }
-            ],
-            "disks": [],
-            "efidisk": [],
-            "force_create": false,
-            "force_recreate_on_change_of": null,
-            "full_clone": true,
-            "hagroup": "",
-            "hastate": "",
-            "hostpci": [],
-            "hotplug": "network,disk,usb",
-            "id": "pve/qemu/100",
-            "ipconfig0": "ip=192.168.122.51/24,gw=192.168.122.1",
-            "ipconfig1": null,
-            "ipconfig10": null,
-            "ipconfig11": null,
-            "ipconfig12": null,
-            "ipconfig13": null,
-            "ipconfig14": null,
-            "ipconfig15": null,
-            "ipconfig2": null,
-            "ipconfig3": null,
-            "ipconfig4": null,
-            "ipconfig5": null,
-            "ipconfig6": null,
-            "ipconfig7": null,
-            "ipconfig8": null,
-            "ipconfig9": null,
-            "kvm": true,
-            "linked_vmid": 0,
-            "machine": "",
-            "memory": 1024,
-            "name": "k3s-worker1",
-            "nameserver": null,
-            "network": [
-              {
-                "bridge": "vmbr0",
-                "firewall": false,
-                "id": 0,
-                "link_down": false,
-                "macaddr": "bc:24:11:1d:05:31",
-                "model": "virtio",
-                "mtu": 0,
-                "queues": 0,
-                "rate": 0,
-                "tag": 0
-              }
-            ],
-            "numa": false,
-            "onboot": false,
-            "os_network_config": null,
-            "os_type": null,
-            "pci": [],
-            "pcis": [],
-            "pool": "",
-            "protection": false,
-            "pxe": null,
-            "qemu_os": "other",
-            "reboot_required": false,
-            "rng": [],
-            "scsihw": "virtio-scsi-pci",
-            "searchdomain": null,
-            "serial": [],
-            "skip_ipv4": false,
-            "skip_ipv6": false,
-            "smbios": [
-              {
-                "family": "",
-                "manufacturer": "",
-                "product": "",
-                "serial": "",
-                "sku": "",
-                "uuid": "06c3315b-e044-40b1-bffe-92e892dff09b",
-                "version": ""
-              }
-            ],
-            "sockets": 0,
-            "ssh_forward_ip": null,
-            "ssh_host": "",
-            "ssh_port": "22",
-            "ssh_private_key": null,
-            "ssh_user": null,
-            "sshkeys": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDFJXEiOlfpKVRYpKvD7e3MlCv+8I0wR9Ed6dPzkCH/0sdUya6cS2Cyh69ctw94CZZ35d0ahhbiDphe8Dz4KeWOdP9WcgG+88JhOEQBiz3tqXT4sP9a2jitdyCkLNnqkrcz9WokC/l8M/RbmFrMJxBhnE5xq++5CcOq/CPxIqtgTiCb6w0R+QxAtjB6jrZ8iuDujmeDHtts+TJ9iDDaS+vckkM5g4M8fprP1/CHIM4rQH2kD8LPy8XLUlPgr3hpJq+FH/2k7dxd7yYUdQG/CYr31x2NfYPAArgosmZHVPttjGljkS5IPr1WDBugXBMian5Oi/7iYE1pRo73NJTarFdfvegTz+emZbOId5O50LofZY7eacGD2XOiN995wStXYUlINjHVCARERk2JCCKoiCaR49aGTala6h2RspkumK46kMvUsrhSPhUu19z8phqYnohEKgmJJfpZeRIFAfZzsX47acAW4MzyJhDFPo53PRKn34sqL1SnL0plqfACeKJbhz8= alex@camulodunum\n",
-            "startup": "",
-            "tablet": true,
-            "tags": " ",
-            "target_node": "pve",
-            "target_nodes": null,
-            "timeouts": null,
-            "tpm_state": [],
-            "unused_disk": [],
-            "usb": [],
-            "usbs": [],
-            "vcpus": 0,
-            "vga": [],
-            "vm_state": "running",
-            "vmid": 100
-          },
-          "sensitive_attributes": [
-            [
-              {
-                "type": "get_attr",
-                "value": "cicustom"
-              }
-            ],
-            [
-              {
-                "type": "get_attr",
-                "value": "cipassword"
-              }
-            ],
-            [
-              {
-                "type": "get_attr",
-                "value": "ssh_private_key"
-              }
-            ]
-          ],
-          "identity_schema_version": 0,
-          "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxMjAwMDAwMDAwMDAwLCJkZWZhdWx0IjoxMjAwMDAwMDAwMDAwLCJkZWxldGUiOjEyMDAwMDAwMDAwMDAsInJlYWQiOjEyMDAwMDAwMDAwMDAsInVwZGF0ZSI6MTIwMDAwMDAwMDAwMH19",
-          "dependencies": [
-            "random_password.k3s_token"
-          ]
-        }
-      ]
-    },
-    {
-      "mode": "managed",
-      "type": "proxmox_vm_qemu",
-      "name": "worker2",
-      "provider": "provider[\"registry.terraform.io/telmate/proxmox\"]",
-      "instances": [
-        {
-          "schema_version": 0,
-          "attributes": {
-            "additional_wait": 5,
-            "agent": 0,
-            "agent_timeout": 90,
-            "args": "",
-            "automatic_reboot": true,
-            "balloon": 0,
-            "bios": "seabios",
-            "boot": "c",
-            "bootdisk": "scsi0",
-            "ci_wait": null,
-            "cicustom": null,
-            "cipassword": "",
-            "ciupgrade": false,
-            "ciuser": "ubuntu",
-            "clone": null,
-            "clone_id": 9000,
-            "clone_wait": 10,
-            "cores": 0,
-            "cpu": [
-              {
-                "affinity": "",
-                "cores": 2,
-                "flags": [],
-                "limit": 0,
-                "numa": false,
-                "sockets": 1,
-                "type": "host",
-                "units": 0,
-                "vcores": 0
-              }
-            ],
-            "cpu_type": "",
-            "current_node": "pve",
-            "default_ipv4_address": "",
-            "default_ipv6_address": "",
-            "define_connection_info": true,
-            "desc": null,
-            "description": "Managed by Terraform.",
-            "disk": [
-              {
-                "asyncio": "",
-                "backup": true,
-                "cache": "",
-                "discard": false,
-                "disk_file": "",
-                "emulatessd": false,
-                "format": "raw",
-                "id": 0,
-                "iops_r_burst": 0,
-                "iops_r_burst_length": 0,
-                "iops_r_concurrent": 0,
-                "iops_wr_burst": 0,
-                "iops_wr_burst_length": 0,
-                "iops_wr_concurrent": 0,
-                "iothread": false,
-                "iso": "",
-                "linked_disk_id": -1,
-                "mbps_r_burst": 0,
-                "mbps_r_concurrent": 0,
-                "mbps_wr_burst": 0,
-                "mbps_wr_concurrent": 0,
-                "passthrough": false,
-                "readonly": false,
-                "replicate": false,
-                "serial": "",
-                "size": "20G",
-                "slot": "scsi0",
-                "storage": "local-lvm",
-                "type": "disk",
-                "wwn": ""
-              }
-            ],
-            "disks": [],
-            "efidisk": [],
-            "force_create": false,
-            "force_recreate_on_change_of": null,
-            "full_clone": true,
-            "hagroup": "",
-            "hastate": "",
-            "hostpci": [],
-            "hotplug": "network,disk,usb",
-            "id": "pve/qemu/101",
-            "ipconfig0": "ip=192.168.122.52/24,gw=192.168.122.1",
-            "ipconfig1": null,
-            "ipconfig10": null,
-            "ipconfig11": null,
-            "ipconfig12": null,
-            "ipconfig13": null,
-            "ipconfig14": null,
-            "ipconfig15": null,
-            "ipconfig2": null,
-            "ipconfig3": null,
-            "ipconfig4": null,
-            "ipconfig5": null,
-            "ipconfig6": null,
-            "ipconfig7": null,
-            "ipconfig8": null,
-            "ipconfig9": null,
-            "kvm": true,
-            "linked_vmid": 0,
-            "machine": "",
-            "memory": 1024,
-            "name": "k3s-worker2",
-            "nameserver": null,
-            "network": [
-              {
-                "bridge": "vmbr0",
-                "firewall": false,
-                "id": 0,
-                "link_down": false,
-                "macaddr": "bc:24:11:72:d9:98",
-                "model": "virtio",
-                "mtu": 0,
-                "queues": 0,
-                "rate": 0,
-                "tag": 0
-              }
-            ],
-            "numa": false,
-            "onboot": false,
-            "os_network_config": null,
-            "os_type": null,
-            "pci": [],
-            "pcis": [],
-            "pool": "",
-            "protection": false,
-            "pxe": null,
-            "qemu_os": "other",
-            "reboot_required": false,
-            "rng": [],
-            "scsihw": "virtio-scsi-pci",
-            "searchdomain": null,
-            "serial": [],
-            "skip_ipv4": false,
-            "skip_ipv6": false,
-            "smbios": [
-              {
-                "family": "",
-                "manufacturer": "",
-                "product": "",
-                "serial": "",
-                "sku": "",
-                "uuid": "7df7f412-d573-4bcf-ac5f-bf77915c21b3",
-                "version": ""
-              }
-            ],
-            "sockets": 0,
-            "ssh_forward_ip": null,
-            "ssh_host": "",
-            "ssh_port": "22",
-            "ssh_private_key": null,
-            "ssh_user": null,
-            "sshkeys": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDFJXEiOlfpKVRYpKvD7e3MlCv+8I0wR9Ed6dPzkCH/0sdUya6cS2Cyh69ctw94CZZ35d0ahhbiDphe8Dz4KeWOdP9WcgG+88JhOEQBiz3tqXT4sP9a2jitdyCkLNnqkrcz9WokC/l8M/RbmFrMJxBhnE5xq++5CcOq/CPxIqtgTiCb6w0R+QxAtjB6jrZ8iuDujmeDHtts+TJ9iDDaS+vckkM5g4M8fprP1/CHIM4rQH2kD8LPy8XLUlPgr3hpJq+FH/2k7dxd7yYUdQG/CYr31x2NfYPAArgosmZHVPttjGljkS5IPr1WDBugXBMian5Oi/7iYE1pRo73NJTarFdfvegTz+emZbOId5O50LofZY7eacGD2XOiN995wStXYUlINjHVCARERk2JCCKoiCaR49aGTala6h2RspkumK46kMvUsrhSPhUu19z8phqYnohEKgmJJfpZeRIFAfZzsX47acAW4MzyJhDFPo53PRKn34sqL1SnL0plqfACeKJbhz8= alex@camulodunum\n",
-            "startup": "",
-            "tablet": true,
-            "tags": " ",
-            "target_node": "pve",
-            "target_nodes": null,
-            "timeouts": null,
-            "tpm_state": [],
-            "unused_disk": [],
-            "usb": [],
-            "usbs": [],
-            "vcpus": 0,
-            "vga": [],
-            "vm_state": "running",
-            "vmid": 101
-          },
-          "sensitive_attributes": [
-            [
-              {
-                "type": "get_attr",
-                "value": "cicustom"
-              }
-            ],
-            [
-              {
-                "type": "get_attr",
-                "value": "cipassword"
-              }
-            ],
-            [
-              {
-                "type": "get_attr",
-                "value": "ssh_private_key"
-              }
-            ]
-          ],
-          "identity_schema_version": 0,
-          "private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjoxMjAwMDAwMDAwMDAwLCJkZWZhdWx0IjoxMjAwMDAwMDAwMDAwLCJkZWxldGUiOjEyMDAwMDAwMDAwMDAsInJlYWQiOjEyMDAwMDAwMDAwMDAsInVwZGF0ZSI6MTIwMDAwMDAwMDAwMH19",
-          "dependencies": [
-            "random_password.k3s_token"
-          ]
-        }
-      ]
-    },
-    {
-      "mode": "managed",
-      "type": "random_password",
-      "name": "k3s_token",
-      "provider": "provider[\"registry.terraform.io/hashicorp/random\"]",
-      "instances": [
-        {
-          "schema_version": 3,
-          "attributes": {
-            "bcrypt_hash": "$2a$10$REdkV8RlQSockZTD1NUXT.CE.DaMq4sNmwGarkFMRwhDXoUv9d.Xy",
-            "id": "none",
-            "keepers": null,
-            "length": 32,
-            "lower": true,
-            "min_lower": 0,
-            "min_numeric": 0,
-            "min_special": 0,
-            "min_upper": 0,
-            "number": true,
-            "numeric": true,
-            "override_special": null,
-            "result": "VExNsWJN66ixpLhLODQLiBuml4SRd0tg",
-            "special": false,
-            "upper": true
-          },
-          "sensitive_attributes": [
-            [
-              {
-                "type": "get_attr",
-                "value": "bcrypt_hash"
-              }
-            ],
-            [
-              {
-                "type": "get_attr",
-                "value": "result"
-              }
-            ]
-          ],
-          "identity_schema_version": 0
-        }
-      ]
-    }
-  ],
-  "check_results": null
-}
diff --git a/infrastructure-admin/terraform.tfvars b/infrastructure-admin/terraform.tfvars
index ab86e48..0bb8974 100644
--- a/infrastructure-admin/terraform.tfvars
+++ b/infrastructure-admin/terraform.tfvars
@@ -16,6 +16,9 @@ target_nodes = {
   worker2    = "pve"
 }
 
+admin_user = "commander"
+admin_password = "1sDgV1uPWC5vu8NQEstx"
+
 # --------------------------
 # SSH Keys for Cloud-Init
 # --------------------------
diff --git a/infrastructure-admin/variables.tf b/infrastructure-admin/variables.tf
index 3548725..1bae9ad 100644
--- a/infrastructure-admin/variables.tf
+++ b/infrastructure-admin/variables.tf
@@ -26,6 +26,12 @@ variable "target_nodes" {
   }
 }
 
+variable "admin_user" { type = string }
+variable "admin_password" {
+    type = string
+    sensitive = true    
+}
+
 variable "ssh_public_key" { type = string }
 variable "bridge" {
   type    = string