From d5bdc6ea540890c114d13c57fb16ff99364b8f5c Mon Sep 17 00:00:00 2001
From: Alex <alex@central.nu>
Date: Wed, 3 Sep 2025 07:24:44 +0200
Subject: [PATCH] a few more fixes

---
 infrastructure-admin/main.tf | 46 +++++++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/infrastructure-admin/main.tf b/infrastructure-admin/main.tf
index c4ce222..8a75f6a 100644
--- a/infrastructure-admin/main.tf
+++ b/infrastructure-admin/main.tf
@@ -42,19 +42,25 @@ resource "proxmox_vm_qemu" "controller" {
   target_node = var.target_nodes["controller"]
   clone       = var.template_id
   full_clone  = true
-  cores       = 2
-  sockets     = 1
+  cpu {
+    cores = 2
+    sockets     = 1
+  }
   memory      = 1024
   scsihw      = "virtio-scsi-pci"
   disk {
+    slot    = 0
     size    = "20G"
     storage = var.storage
     type    = "scsi"
   }
-  network { bridge = var.bridge }
+  network {
+    id     = 0
+    model  = "virtio"
+    bridge = var.bridge
+  }
   ipconfig0 = "ip=${var.controller_ip}/${var.netmask},gw=${var.gateway}"
   ciuser = "ubuntu"
-  citype = "cloud-init"
   sshkeys = var.ssh_public_key
 
   cicustom = <<EOT
@@ -76,19 +82,25 @@ resource "proxmox_vm_qemu" "worker1" {
   target_node = var.target_nodes["worker1"]
   clone       = var.template_id
   full_clone  = true
-  cores       = 2
-  sockets     = 1
+  cpu {
+    cores = 2
+    sockets     = 1
+  }
   memory      = 1024
   scsihw      = "virtio-scsi-pci"
   disk {
+    slot    = 0
     size    = "20G"
     storage = var.storage
     type    = "scsi"
   }
-  network { bridge = var.bridge }
+  network {
+    id     = 0
+    model  = "virtio"
+    bridge = var.bridge
+  }
   ipconfig0 = "ip=${var.worker1_ip}/${var.netmask},gw=${var.gateway}"
   ciuser = "ubuntu"
-  citype = "cloud-init"
   sshkeys = var.ssh_public_key
 
   cicustom = <<EOT
@@ -110,19 +122,25 @@ resource "proxmox_vm_qemu" "worker2" {
   target_node = var.target_nodes["worker2"]
   clone       = var.template_id
   full_clone  = true
-  cores       = 2
-  sockets     = 1
+  cpu {
+    cores = 2
+    sockets     = 1
+  }
   memory      = 1024
   scsihw      = "virtio-scsi-pci"
-    disk {
+  disk {
+    slot    = 0
     size    = "20G"
     storage = var.storage
     type    = "scsi"
   }
-  network { bridge = var.bridge }
+  network {
+    id     = 0
+    model  = "virtio"
+    bridge = var.bridge
+  }
   ipconfig0 = "ip=${var.worker2_ip}/${var.netmask},gw=${var.gateway}"
   ciuser = "ubuntu"
-  citype = "cloud-init"
   sshkeys = var.ssh_public_key
 
   cicustom = <<EOT
@@ -144,7 +162,7 @@ provider "kubernetes" {
 }
 
 provider "helm" {
-  kubernetes {
+  kubernetes = {
     config_path = "~/.kube/config"
   }
 }