diff --git a/proxmox/common.tf b/proxmox/common.tf index adbe1d6..e68b119 100644 --- a/proxmox/common.tf +++ b/proxmox/common.tf @@ -65,18 +65,16 @@ resource "proxmox_virtual_environment_vm" "template" { ssd = true iothread = true cache = "none" - size = 3 + size = 5 file_format = "raw" } network_device { bridge = "vmbr0" - mtu = 1500 firewall = true } network_device { bridge = "vmbr1" - mtu = 1400 firewall = false } diff --git a/proxmox/deployments/talos-ccm.yaml b/proxmox/deployments/talos-ccm.yaml index 860d529..a699fff 100644 --- a/proxmox/deployments/talos-ccm.yaml +++ b/proxmox/deployments/talos-ccm.yaml @@ -69,3 +69,6 @@ transformations: platformMetadata: InstanceType: "{{ coalesce .InstanceType .SKUNumber }}" ProviderID: '{{ if .SerialNumber }}proxmox://region-1/{{ getValue .SerialNumber "i" }}{{ else }}{{ .ProviderID }}{{ end }}' + labels: + topology.proxmox.sinextra.dev/node: "{{ .Zone }}" + topology.proxmox.sinextra.dev/region: "{{ .Region }}" diff --git a/proxmox/instances-controlplane.tf b/proxmox/instances-controlplane.tf index a8dc694..5f8692e 100644 --- a/proxmox/instances-controlplane.tf +++ b/proxmox/instances-controlplane.tf @@ -51,11 +51,12 @@ resource "proxmox_virtual_environment_file" "controlplane_metadata" { } resource "proxmox_virtual_environment_vm" "controlplane" { - for_each = local.controlplanes - name = each.value.name - node_name = each.value.zone - vm_id = each.value.id - description = "Talos controlplane at ${var.region}" + for_each = local.controlplanes + name = each.value.name + node_name = each.value.zone + vm_id = each.value.id + reboot_after_update = false + description = "Talos controlplane at ${var.region}" machine = "q35" cpu { diff --git a/proxmox/instances-db.tf b/proxmox/instances-db.tf index d595439..8efc098 100644 --- a/proxmox/instances-db.tf +++ b/proxmox/instances-db.tf @@ -81,11 +81,12 @@ resource "proxmox_virtual_environment_file" "db_metadata" { } resource "proxmox_virtual_environment_vm" "db" { - for_each = local.dbs - name = each.value.name - node_name = each.value.zone - vm_id = each.value.id - description = "Talos database node" + for_each = local.dbs + name = each.value.name + node_name = each.value.zone + vm_id = each.value.id + reboot_after_update = false + description = "Talos database node" startup { order = 5 diff --git a/proxmox/instances-web.tf b/proxmox/instances-web.tf index b831a8d..76bc05e 100644 --- a/proxmox/instances-web.tf +++ b/proxmox/instances-web.tf @@ -102,11 +102,12 @@ resource "proxmox_virtual_environment_file" "web_metadata" { # } resource "proxmox_virtual_environment_vm" "web" { - for_each = local.webs - name = each.value.name - node_name = each.value.zone - vm_id = each.value.id - description = "Talos web node" + for_each = local.webs + name = each.value.name + node_name = each.value.zone + vm_id = each.value.id + reboot_after_update = false + description = "Talos web node" startup { order = 3 diff --git a/proxmox/instances-worker.tf b/proxmox/instances-worker.tf index f48dab0..2b9b41a 100644 --- a/proxmox/instances-worker.tf +++ b/proxmox/instances-worker.tf @@ -80,11 +80,12 @@ resource "proxmox_virtual_environment_file" "worker_metadata" { } resource "proxmox_virtual_environment_vm" "worker" { - for_each = local.workers - name = each.value.name - node_name = each.value.zone - vm_id = each.value.id - description = "Talos worker node" + for_each = local.workers + name = each.value.name + node_name = each.value.zone + vm_id = each.value.id + reboot_after_update = true + description = "Talos worker node" startup { order = 7 diff --git a/proxmox/variables.tf b/proxmox/variables.tf index 86fa404..bb67174 100644 --- a/proxmox/variables.tf +++ b/proxmox/variables.tf @@ -26,7 +26,7 @@ variable "vpc_main_cidr" { variable "release" { type = string description = "The version of the Talos image" - default = "1.11.2" + default = "1.11.3" } data "sops_file" "tfvars" { diff --git a/proxmox/versions.tf b/proxmox/versions.tf index 880ab3a..3ac4f0b 100644 --- a/proxmox/versions.tf +++ b/proxmox/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { proxmox = { source = "bpg/proxmox" - version = "0.66.3" + version = "0.86.0" } sops = { source = "carlpett/sops"