Merge pull request #85 from corebug/main

Make PVE bridge name and config_patches optional

Author: pascalinthecloud

README.md

@@ -37,6 +37,7 @@ module "k8s_cluster" {
   }
 
   network = {
+    bridge      = "vmbr0"
     cidr        = "10.10.100.0/24"
     gateway     = "10.10.100.1"
     dns_servers = ["10.0.10.1", "1.1.1.1"]
@@ -80,6 +81,7 @@ module "k8s_cluster_override" {
   }
 
   network = {
+    bridge      = "vmbr0"
     cidr        = "10.10.100.0/24"
     gateway     = "10.10.100.1"
     dns_servers = ["10.0.10.1", "1.1.1.1"]
@@ -135,12 +137,12 @@ module "k8s_cluster_override" {
 
 ## Inputs
 
-| Name | Description | Type | Default | Required |
-|------|-------------|------|---------|:--------:|
-| <a name="input_cluster"></a> [cluster](#input\_cluster) | Cluster configuration | <pre>object({<br/>    name           = string                       # The name of the cluster<br/>    config_patches = list(string)                 # List of configuration patches to apply to the Talos machine configuration<br/>    node           = string                       # Default node to deploy the vms on<br/>    datastore      = string                       # Default datastore to deploy the vms on<br/>    vm_base_id     = number                       # The first VM ID for Proxmox VMs, with subsequent IDs counted up from it<br/>    install_disk   = optional(string, "/dev/sda") # The disk to install Talos on<br/>  })</pre> | n/a | yes |
+| Name | Description | Type                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Default | Required |
+|------|-------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|:--------:|
+| <a name="input_cluster"></a> [cluster](#input\_cluster) | Cluster configuration | <pre>object({<br/>    name           = string                       # The name of the cluster<br/>    config_patches = optional(list(string), [])   # List of configuration patches to apply to the Talos machine configuration<br/>    node           = string                       # Default node to deploy the vms on<br/>    datastore      = string                       # Default datastore to deploy the vms on<br/>    vm_base_id     = number                       # The first VM ID for Proxmox VMs, with subsequent IDs counted up from it<br/>    install_disk   = optional(string, "/dev/sda") # The disk to install Talos on<br/>  })</pre>                                                                 | n/a | yes |
 | <a name="input_controlplane"></a> [controlplane](#input\_controlplane) | Specification of controlplane nodes | <pre>object({<br/>    count = number<br/>    specs = object({<br/>      cpu    = number<br/>      memory = number<br/>      disk   = number<br/>    })<br/>    overrides = optional(map(object({<br/>      datastore    = optional(string, null)<br/>      node         = optional(string, null)<br/>      cpu          = optional(number, null)<br/>      memory       = optional(number, null)<br/>      disk         = optional(number, null)<br/>      install_disk = optional(string, null)<br/>      network = optional(object({<br/>        ip_address = string<br/>        cidr       = string<br/>        gateway    = string<br/>        vlan_id    = optional(number, null)<br/>      }), null)<br/>    })), {})<br/>  })</pre> | n/a | yes |
-| <a name="input_image"></a> [image](#input\_image) | Variable to define the image configuration for Talos machines | <pre>object({<br/>    version           = string<br/>    extensions        = list(string)<br/>    factory_url       = optional(string, "https://factory.talos.dev")<br/>    arch              = optional(string, "amd64")<br/>    platform          = optional(string, "nocloud")<br/>    proxmox_datastore = optional(string, "local")<br/>  })</pre> | n/a | yes |
-| <a name="input_network"></a> [network](#input\_network) | Network configuration for nodes | <pre>object({<br/>    cidr        = string<br/>    gateway     = string<br/>    dns_servers = list(string)<br/>    vlan_id     = optional(number, null)<br/>  })</pre> | n/a | yes |
+| <a name="input_image"></a> [image](#input\_image) | Variable to define the image configuration for Talos machines | <pre>object({<br/>    version           = string<br/>    extensions        = list(string)<br/>    factory_url       = optional(string, "https://factory.talos.dev")<br/>    arch              = optional(string, "amd64")<br/>    platform          = optional(string, "nocloud")<br/>    proxmox_datastore = optional(string, "local")<br/>  })</pre>                                                                                                                                                                                                                                                                                                                                                                       | n/a | yes |
+| <a name="input_network"></a> [network](#input\_network) | Network configuration for nodes | <pre>object({<br/>    bridge      = string<br/>    cidr        = string<br/>    gateway     = string<br/>    dns_servers = list(string)<br/>    vlan_id     = optional(number, null)<br/>  })</pre>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | n/a | yes |
 | <a name="input_worker"></a> [worker](#input\_worker) | Specification of worker nodes | <pre>object({<br/>    count = number<br/>    specs = object({<br/>      cpu    = number<br/>      memory = number<br/>      disk   = number<br/>    })<br/>    overrides = optional(map(object({<br/>      datastore    = optional(string, null)<br/>      node         = optional(string, null)<br/>      cpu          = optional(number, null)<br/>      memory       = optional(number, null)<br/>      disk         = optional(number, null)<br/>      install_disk = optional(string, null)<br/>      network = optional(object({<br/>        ip_address = string<br/>        cidr       = string<br/>        gateway    = string<br/>        vlan_id    = optional(number, null)<br/>      }), null)<br/>    })), {})<br/>  })</pre> | n/a | yes |
 
 ## Outputs
@@ -154,4 +156,4 @@ module "k8s_cluster_override" {
 
 ## Repo Activity
 ![Alt](https://repobeats.axiom.co/api/embed/d5c6fd467a9febbf9bea34fbcd6eb31174975075.svg "Repobeats analytics image")
-<!-- END_TF_DOCS -->
+<!-- END_TF_DOCS -->

examples/main.example

@@ -15,6 +15,7 @@ module "k8s_cluster" {
   }
 
   network = {
+    brige       = "vmbr0"
     cidr        = "10.10.100.0/24"
     gateway     = "10.10.100.1"
     dns_servers = ["10.0.10.1", "1.1.1.1"]
@@ -93,4 +94,4 @@ module "k8s_cluster_override" {
       }
     }
   }
-}
+}

proxmox_vm_controlplanes.tf

@@ -13,7 +13,7 @@ resource "proxmox_virtual_environment_vm" "controlplane" {
     disk         = each.value.disk
     proxmox_node = each.value.node
   })
-  tags = [var.cluster.name]
+  tags          = [var.cluster.name]
   vm_id         = each.value.vm_id
   machine       = "q35"
   scsi_hardware = "virtio-scsi-single"
@@ -33,7 +33,7 @@ resource "proxmox_virtual_environment_vm" "controlplane" {
   }
 
   network_device {
-    bridge  = "vmbr0"
+    bridge  = var.network.bridge
     vlan_id = var.network.vlan_id
   }
 

proxmox_vm_worker.tf

@@ -13,7 +13,7 @@ resource "proxmox_virtual_environment_vm" "worker" {
     disk         = each.value.disk
     proxmox_node = each.value.node
   })
-  tags = [var.cluster.name]
+  tags          = [var.cluster.name]
   vm_id         = each.value.vm_id
   machine       = "q35"
   scsi_hardware = "virtio-scsi-single"
@@ -33,7 +33,7 @@ resource "proxmox_virtual_environment_vm" "worker" {
   }
 
   network_device {
-    bridge  = "vmbr0"
+    bridge  = var.network.bridge
     vlan_id = var.network.vlan_id
   }
 

variables.tf

@@ -2,7 +2,7 @@ variable "cluster" {
   description = "Cluster configuration"
   type = object({
     name           = string                       # The name of the cluster
-    config_patches = list(string)                 # List of configuration patches to apply to the Talos machine configuration
+    config_patches = optional(list(string), [])   # List of configuration patches to apply to the Talos machine configuration
     node           = string                       # Default node to deploy the vms on
     datastore      = string                       # Default datastore to deploy the vms on
     vm_base_id     = number                       # The first VM ID for Proxmox VMs, with subsequent IDs counted up from it
@@ -55,6 +55,7 @@ variable "image" {
 variable "network" {
   description = "Network configuration for nodes"
   type = object({
+    bridge      = optional(string, "vmbr0") # The bridge to use for the network interface
     cidr        = string
     gateway     = string
     dns_servers = list(string)