Merge pull request #1347 from WebSpider/1344

Keep OS disk size

agents.tf

@@ -28,6 +28,7 @@ module "agents" {
   cloudinit_runcmd_common      = local.cloudinit_runcmd_common
   swap_size                    = each.value.swap_size
   zram_size                    = each.value.zram_size
+  keep_disk_size               = var.keep_disk_agents
 
   private_ipv4 = cidrhost(hcloud_network_subnet.agent[[for i, v in var.agent_nodepools : i if v.name == each.value.nodepool_name][0]].ip_range, each.value.index + 101)
 

control_planes.tf

@@ -28,6 +28,7 @@ module "control_planes" {
   cloudinit_runcmd_common      = local.cloudinit_runcmd_common
   swap_size                    = each.value.swap_size
   zram_size                    = each.value.zram_size
+  keep_disk_size               = var.keep_disk_cp
 
   # We leave some room so 100 eventual Hetzner LBs that can be created perfectly safely
   # It leaves the subnet with 254 x 254 - 100 = 64416 IPs to use, so probably enough.

docs/terraform.md

@@ -168,6 +168,8 @@
 | <a name="input_k3s_global_kubelet_args"></a> [k3s\_global\_kubelet\_args](#input\_k3s\_global\_kubelet\_args) | Global kubelet args for all nodes. | `list(string)` | `[]` | no |
 | <a name="input_k3s_registries"></a> [k3s\_registries](#input\_k3s\_registries) | K3S registries.yml contents. It used to access private docker registries. | `string` | `" "` | no |
 | <a name="input_k3s_token"></a> [k3s\_token](#input\_k3s\_token) | k3s master token (must match when restoring a cluster). | `string` | `null` | no |
+| <a name="input_keep_disk_agents"></a> [keep\_disk\_agents](#input\_keep\_disk\_agents) | Whether to keep OS disks of nodes the same size when upgrading an agent node | `bool` | `false` | no |
+| <a name="input_keep_disk_cp"></a> [keep\_disk\_cp](#input\_keep\_disk\_cp) | Whether to keep OS disks of nodes the same size when upgrading a control-plane node | `bool` | `false` | no |
 | <a name="input_kured_options"></a> [kured\_options](#input\_kured\_options) | n/a | `map(string)` | `{}` | no |
 | <a name="input_kured_version"></a> [kured\_version](#input\_kured\_version) | Version of Kured. | `string` | `null` | no |
 | <a name="input_lb_hostname"></a> [lb\_hostname](#input\_lb\_hostname) | The Hetzner Load Balancer hostname, for either Traefik or Ingress-Nginx. | `string` | `""` | no |

modules/host/main.tf

@@ -29,6 +29,7 @@ resource "hcloud_server" "server" {
   placement_group_id = var.placement_group_id
   backups            = var.backups
   user_data          = data.cloudinit_config.config.rendered
+  keep_disk          = var.keep_disk_size
 
   labels = var.labels
 

modules/host/variables.tf

@@ -138,3 +138,9 @@ variable "zram_size" {
     error_message = "Invalid zram size. Examples: 512M, 1G"
   }
 }
+
+variable "keep_disk_size" {
+  type        = bool
+  default     = false
+  description = "Whether to keep OS disks of nodes the same size when upgrading a node"
+}

variables.tf

@@ -1009,3 +1009,15 @@ variable "enable_delete_protection" {
   }
   description = "Enable or disable delete protection for resources in Hetzner Cloud."
 }
+
+variable "keep_disk_agents" {
+  type        = bool
+  default     = false
+  description = "Whether to keep OS disks of nodes the same size when upgrading an agent node"
+}
+
+variable "keep_disk_cp" {
+  type        = bool
+  default     = false
+  description = "Whether to keep OS disks of nodes the same size when upgrading a control-plane node"
+}