merge master into automatic-subnets

main.tf

@@ -1,21 +1,24 @@
-resource "random_pet" "cluster" {
-  length = 1
-  prefix = var.cluster_prefix
-}
-
 resource "random_password" "k3s_token" {
   length  = 48
   special = false
 }
 
 resource "hcloud_ssh_key" "k3s" {
-  name       = random_pet.cluster.id
+  name       = var.cluster_name
   public_key = local.ssh_public_key
 }
 
 resource "hcloud_network" "k3s" {
-  name     = random_pet.cluster.id
-  ip_range = local.network_ipv4_cidr
+  name     = var.cluster_name
+  ip_range = var.network_ipv4_range
+}
+
+# This is the default subnet to be used by the load balancer.
+resource "hcloud_network_subnet" "default" {
+  network_id   = hcloud_network.k3s.id
+  type         = "cloud"
+  network_zone = var.network_region
+  ip_range     = "10.0.0.0/16"
 }
 
 resource "hcloud_network_subnet" "subnet" {
@@ -27,7 +30,7 @@ resource "hcloud_network_subnet" "subnet" {
 }
 
 resource "hcloud_firewall" "k3s" {
-  name = random_pet.cluster.id
+  name = var.cluster_name
 
   dynamic "rule" {
     for_each = concat(local.base_firewall_rules, var.extra_firewall_rules)
@@ -42,7 +45,7 @@ resource "hcloud_firewall" "k3s" {
 }
 
 resource "hcloud_placement_group" "k3s" {
-  name = random_pet.cluster.id
+  name = var.cluster_name
   type = "spread"
   labels = {
     "provisioner" = "terraform",
@@ -52,7 +55,7 @@ resource "hcloud_placement_group" "k3s" {
 
 data "hcloud_load_balancer" "traefik" {
   count = local.is_single_node_cluster ? 0 : 1
-  name  = "${random_pet.cluster.id}-traefik"
+  name  = "${var.cluster_name}-traefik"
 
   depends_on = [null_resource.kustomization]
 }