Dbp 333 expand the terraform module for autoscaling functionality

modules/ionos-k8s-cluster/README.md

@@ -21,9 +21,11 @@ No modules.
 | <a name="input_allow_node_pool_replacement"></a> [allow\_node\_pool\_replacement](#input\_allow\_node\_pool\_replacement) | When set to true, allows the update of immutable fields by first destroying and then re-creating the node pool. | `bool` | `false` | no |
 | <a name="input_api_subnet_allow_list"></a> [api\_subnet\_allow\_list](#input\_api\_subnet\_allow\_list) | n/a | `list(string)` | `null` | no |
 | <a name="input_associated_lans"></a> [associated\_lans](#input\_associated\_lans) | The lans as objects in a list [{lan[0] with id and routes\_list, lan[1] with id and routes\_list}, ...] | <pre>list(object({<br>    id          = number<br>    routes_list = list(any)<br>  }))</pre> | `[]` | no |
-| <a name="input_availability_zone"></a> [availability\_zone](#input\_availability\_zone) | n/a | `string` | `"ZONE_1"` | no |
+| <a name="input_availability_zone"></a> [availability\_zone](#input\_availability\_zone) | Not needed anymore, we work with a list of zones now | `string` | `"ZONE_1"` | no |
 | <a name="input_cpu_family"></a> [cpu\_family](#input\_cpu\_family) | Valid cpu family | `string` | `"INTEL_SKYLAKE"` | no |
 | <a name="input_create_public_ip_pools"></a> [create\_public\_ip\_pools](#input\_create\_public\_ip\_pools) | n/a | `bool` | `false` | no |
+| <a name="input_custom_nodepools"></a> [custom\_nodepools](#input\_custom\_nodepools) | This object describes nodepool configurations for dynamic creation of nodepools with a specific purpose and resources. | <pre>list(object({<br>    name          = string<br>    auto_scaling  = optional(bool, false)<br>    node_count = number<br>    nodepool_per_zone_count = number<br>    min_node_count= optional(number, null)<br>    max_node_count= optional(number, null)<br>    ram_size      = number<br>    core_count    = number<br>    purpose       = string<br>    availability_zones = list(string)<br>    allow_node_pool_replacement = bool<br>    associated_lans = list(object({<br>      id          = number<br>      routes_list = list(any)<br>    }))<br>    maintenance_day = string<br>    maintenance_hour = number<br>    storage_type = string<br>    storage_size = number<br>    cpu_family = string<br>    create_public_ip_pools = bool<br>    public_ips = map(list(list(string)))<br>    })<br>  )</pre> | <pre>[<br>  {<br>    "allow_node_pool_replacement": null,<br>    "associated_lans": null,<br>    "auto_scaling": false,<br>    "availability_zones": [<br>      "ZONE_1",<br>      "ZONE_2"<br>    ],<br>    "core_count": null,<br>    "cpu_family": null,<br>    "create_public_ip_pools": null,<br>    "maintenance_day": null,<br>    "maintenance_hour": null,<br>    "max_node_count": null,<br>    "min_node_count": null,<br>    "name": "Legacy",<br>    "node_count": null,<br>    "nodepool_per_zone_count": null,<br>    "public_ips": {<br>      "ZONE_1": [<br>        [<br>          ""<br>        ]<br>      ],<br>      "ZONE_2": [<br>        [<br>          ""<br>        ]<br>      ]<br>    },<br>    "purpose": "legacy",<br>    "ram_size": null,<br>    "storage_size": null,<br>    "storage_type": null<br>  }<br>]</pre> | no |
+| <a name="input_enable_legacy_and_scaling"></a> [enable\_legacy\_and\_scaling](#input\_enable\_legacy\_and\_scaling) | Determins if both should be used, otherwise only one will be used where custom\_nodepools overwrite legacy ones | `bool` | `false` | no |
 | <a name="input_k8s_version"></a> [k8s\_version](#input\_k8s\_version) | Kubernetes version | `string` | `"1.24.15"` | no |
 | <a name="input_maintenance_day"></a> [maintenance\_day](#input\_maintenance\_day) | On which day to do the maintenance | `string` | `"Saturday"` | no |
 | <a name="input_maintenance_hour"></a> [maintenance\_hour](#input\_maintenance\_hour) | On which hour to do the maintenance | `number` | `3` | no |
@@ -41,8 +43,6 @@ No modules.
 | <a name="output_cluster_name"></a> [cluster\_name](#output\_cluster\_name) | n/a |
 | <a name="output_nodepool_zone1_id"></a> [nodepool\_zone1\_id](#output\_nodepool\_zone1\_id) | n/a |
 | <a name="output_nodepool_zone1_ips"></a> [nodepool\_zone1\_ips](#output\_nodepool\_zone1\_ips) | n/a |
-| <a name="output_nodepool_zone2_id"></a> [nodepool\_zone2\_id](#output\_nodepool\_zone2\_id) | n/a |
-| <a name="output_nodepool_zone2_ips"></a> [nodepool\_zone2\_ips](#output\_nodepool\_zone2\_ips) | n/a |
 ## Requirements
 
 | Name | Version |
@@ -53,9 +53,8 @@ No modules.
 
 | Name | Type |
 |------|------|
-| [ionoscloud_ipblock.ippools_zone1](https://registry.terraform.io/providers/ionos-cloud/ionoscloud/6.3.6/docs/resources/ipblock) | resource |
-| [ionoscloud_ipblock.ippools_zone2](https://registry.terraform.io/providers/ionos-cloud/ionoscloud/6.3.6/docs/resources/ipblock) | resource |
+| [ionoscloud_ipblock.ippools](https://registry.terraform.io/providers/ionos-cloud/ionoscloud/6.3.6/docs/resources/ipblock) | resource |
 | [ionoscloud_k8s_cluster.cluster](https://registry.terraform.io/providers/ionos-cloud/ionoscloud/6.3.6/docs/resources/k8s_cluster) | resource |
-| [ionoscloud_k8s_node_pool.nodepool_zone1](https://registry.terraform.io/providers/ionos-cloud/ionoscloud/6.3.6/docs/resources/k8s_node_pool) | resource |
-| [ionoscloud_k8s_node_pool.nodepool_zone2](https://registry.terraform.io/providers/ionos-cloud/ionoscloud/6.3.6/docs/resources/k8s_node_pool) | resource |
+| [ionoscloud_k8s_node_pool.nodepool_legacy](https://registry.terraform.io/providers/ionos-cloud/ionoscloud/6.3.6/docs/resources/k8s_node_pool) | resource |
+| [ionoscloud_k8s_node_pool.nodepool_scaling](https://registry.terraform.io/providers/ionos-cloud/ionoscloud/6.3.6/docs/resources/k8s_node_pool) | resource |
 <!-- END_TF_DOCS -->

modules/ionos-k8s-cluster/locals.tf

@@ -3,20 +3,66 @@ locals {
   # Valid choices depend on the datacenter location:
   # de/txl, de/fra: INTEL_SKYLAKE
   cpu_family = var.cpu_family
-  # Number of nodes per nodepool. 
-  # Note that one nodepool is created in each availability zone.
-  # Example: With 2 zones, the actual total node count is twice as high as the number stated here.
-  node_count = var.node_count
-  # This cannot be changed, after the nodepool is created, because all worker nodes must be equal at any time.
-  core_count = var.core_count
-  # This cannot be changed, after the nodepool is created, because all worker nodes must be equal at any time.
-  ram_size = var.ram_size != null ? var.ram_size : 16384
-  # The number of nodepools per zone.
-  nodepool_per_zone_count = var.nodepool_per_zone_count
-  public_ip_pool_zone1    = var.create_public_ip_pools ? ionoscloud_ipblock.ippools_zone1[*].ips : var.public_ip_pool_zone1
-  public_ip_pool_zone2    = var.create_public_ip_pools ? ionoscloud_ipblock.ippools_zone2[*].ips : var.public_ip_pool_zone2
-  maintenance_day         = var.maintenance_day
-  maintenance_hour        = var.maintenance_hour
+
   api_subnet_allow_list   = var.api_subnet_allow_list
+
+  #Create legacy object for possible merging into the nodepool list(Only used when both legacy and custom nodespools are in use)
+  legacy_object = tolist([{
+    name = "Legacy"
+    auto_scaling = false
+    nodepool_per_zone_count = null
+    node_count = null
+    min_node_count= null
+    max_node_count= null
+    ram_size = null
+    core_count = null
+    purpose = "legacy"
+    availability_zones = ["ZONE_1", "ZONE_2"]
+    allow_node_pool_replacement = null
+    associated_lans = var.associated_lans
+    maintenance_day = null
+    maintenance_hour = null
+    storage_type = null
+    storage_size = null
+    cpu_family = null
+    create_public_ip_pools = null
+    public_ips = {ZONE_1=[[]], ZONE_2=[[]]}
+  }])
+
+  #check if both legacy and scaling should be used, if so merge legacy object into the object list if needed (default = false)
+  #if false: No need to do anything because it is either legacy or scaling
+  #if true: check if first object is legacy, if not only scaling objects are in the list => merge legacy into it
+  legacy_check = var.enable_legacy_and_scaling == false ? var.custom_nodepools : (var.custom_nodepools[0].purpose != "legacy" ? tolist(concat(var.custom_nodepools, local.legacy_object)) : var.custom_nodepools)
+
+  #availability_zone_split duplicates objects with each of their Availability zones once. if [ZONE1, ZONE2] we get 2 objects with one of those zones each.
+  availability_zone_split = toset(flatten([for n in local.legacy_check : [for x in n.availability_zones : merge(n,{availability_zone = x})] ]))
+
+  #Loop through our nodepool list to detect empty values and fill them with legacy values
+  #Only required for downward compatibility and legacy nodepools (If no downward compatibility is required just use var.custom_nodepools to loop over)
+  custom_nodepools =  [ for np in local.availability_zone_split : {
+      name = np.name
+      purpose = np.purpose
+      auto_scaling = np.auto_scaling
+      min_node_count = np.min_node_count
+      max_node_count = np.max_node_count
+      availability_zone = np.availability_zone
+      nodepool_per_zone_count = np.nodepool_per_zone_count != null ? np.nodepool_per_zone_count : var.nodepool_per_zone_count
+      node_count = np.node_count != null ? np.node_count : var.node_count
+      ram_size = np.ram_size != null ? np.ram_size : var.ram_size
+      core_count = np.core_count != null ? np.core_count : var.core_count
+      allow_node_pool_replacement = np.allow_node_pool_replacement != null ? np.allow_node_pool_replacement : var.allow_node_pool_replacement
+      associated_lans = np.associated_lans != null ? np.associated_lans : var.associated_lans
+      maintenance_day = np.maintenance_day != null ? np.maintenance_day : var.maintenance_day
+      maintenance_hour = np.maintenance_hour != null ? np.maintenance_hour : var.maintenance_hour
+      storage_type = np.storage_type != null ? np.storage_type : var.storage_type
+      storage_size = np.storage_size != null ? np.storage_size : var.storage_size
+      cpu_family = np.cpu_family != null ? np.cpu_family : var.cpu_family
+      create_public_ip_pools = np.create_public_ip_pools != null ? np.create_public_ip_pools : var.create_public_ip_pools
+      public_ips = np.create_public_ip_pools == true ? [[]] : np.purpose == "legacy" ? (np.availability_zone == "ZONE_1" ? var.public_ip_pool_zone1 : var.public_ip_pool_zone2) : np.public_ips[np.availability_zone]
+    }  
+  ]
+
+  #nodepool_per_zone_creator this duplicates the objects in each availability zone to the amount of nodepool_per_zone_count
+  nodepool_per_zone_creator = toset(flatten([for n in local.custom_nodepools : [for x in range(0, n.nodepool_per_zone_count) : merge(n,{nodepool_index = x})] ]))
 }