Add defaults for compute cluster configuration (#73)

Signed-off-by: Jim Enright <[email protected]>

Author: jimright

aws/README.md

@@ -51,7 +51,7 @@
 | <a name="input_cdp_private_subnet_ids"></a> [cdp\_private\_subnet\_ids](#input\_cdp\_private\_subnet\_ids) | List of private subnet ids. Required if create\_vpc is false. | `list(any)` | `null` | no |
 | <a name="input_cdp_public_subnet_ids"></a> [cdp\_public\_subnet\_ids](#input\_cdp\_public\_subnet\_ids) | List of public subnet ids. Required if create\_vpc is false. | `list(any)` | `null` | no |
 | <a name="input_cdp_vpc_id"></a> [cdp\_vpc\_id](#input\_cdp\_vpc\_id) | VPC ID for CDP environment. Required if create\_vpc is false. | `string` | `null` | no |
-| <a name="input_compute_cluster_configuration"></a> [compute\_cluster\_configuration](#input\_compute\_cluster\_configuration) | Kubernetes configuration for the externalized compute cluster | <pre>object({<br/>    kube_api_authorized_ip_ranges = optional(set(string))<br/>    outbound_type                 = optional(string)<br/>    private_cluster               = optional(bool)<br/>    worker_node_subnets           = optional(set(string))<br/>  })</pre> | `null` | no |
+| <a name="input_compute_cluster_configuration"></a> [compute\_cluster\_configuration](#input\_compute\_cluster\_configuration) | Kubernetes configuration for the externalized compute cluster. If not specified, a default configuration suitable for the requested deployment template will be used. | <pre>object({<br/>    kube_api_authorized_ip_ranges = optional(set(string))<br/>    private_cluster               = optional(bool)<br/>    worker_node_subnets           = optional(set(string))<br/>  })</pre> | `null` | no |
 | <a name="input_compute_cluster_enabled"></a> [compute\_cluster\_enabled](#input\_compute\_cluster\_enabled) | Enable externalized compute cluster for the environment | `bool` | `false` | no |
 | <a name="input_create_vpc"></a> [create\_vpc](#input\_create\_vpc) | Flag to specify if the VPC should be created | `bool` | `true` | no |
 | <a name="input_create_vpc_endpoints"></a> [create\_vpc\_endpoints](#input\_create\_vpc\_endpoints) | Flag to specify if VPC Endpoints should be created | `bool` | `true` | no |

aws/main.tf

@@ -106,7 +106,7 @@ module "cdp_deploy" {
   cdp_groups          = local.cdp_groups
 
   compute_cluster_enabled       = var.compute_cluster_enabled
-  compute_cluster_configuration = var.compute_cluster_configuration
+  compute_cluster_configuration = local.compute_cluster_configuration
 
   environment_async_creation = var.environment_async_creation
   datalake_async_creation    = var.datalake_async_creation
@@ -218,4 +218,15 @@ locals {
       add_id_broker_mappings = true
     }
   ])
-}
+}
+
+# ------- Set default compute cluster configuration if enabled
+locals {
+  compute_cluster_configuration = var.compute_cluster_enabled ? (
+    var.compute_cluster_configuration != null ? var.compute_cluster_configuration : {
+      kube_api_authorized_ip_ranges = var.deployment_template == "private" ? null : toset(local.ingress_extra_cidrs_and_ports.cidrs)
+      worker_node_subnets           = var.deployment_template == "public" ? (concat(module.cdp_aws_prereqs.aws_public_subnet_ids, module.cdp_aws_prereqs.aws_private_subnet_ids)) : (module.cdp_aws_prereqs.aws_private_subnet_ids)
+      private_cluster               = var.deployment_template == "private" ? true : false
+    }
+  ) : null
+}

aws/variables.tf

@@ -181,12 +181,11 @@ variable "compute_cluster_enabled" {
 variable "compute_cluster_configuration" {
   type = object({
     kube_api_authorized_ip_ranges = optional(set(string))
-    outbound_type                 = optional(string)
     private_cluster               = optional(bool)
     worker_node_subnets           = optional(set(string))
   })
 
-  description = "Kubernetes configuration for the externalized compute cluster"
+  description = "Kubernetes configuration for the externalized compute cluster. If not specified, a default configuration suitable for the requested deployment template will be used."
 
   default = null
 }

azure/README.md

@@ -50,7 +50,7 @@
 | <a name="input_cdp_resourcegroup_name"></a> [cdp\_resourcegroup\_name](#input\_cdp\_resourcegroup\_name) | Pre-existing Resource Group for CDP environment. Required if create\_vnet is false. | `string` | `null` | no |
 | <a name="input_cdp_subnet_names"></a> [cdp\_subnet\_names](#input\_cdp\_subnet\_names) | List of subnet names for CDP Resources. Required if create\_vnet is false. | `list(any)` | `null` | no |
 | <a name="input_cdp_vnet_name"></a> [cdp\_vnet\_name](#input\_cdp\_vnet\_name) | Pre-existing VNet Name for CDP environment. Required if create\_vnet is false. | `string` | `null` | no |
-| <a name="input_compute_cluster_configuration"></a> [compute\_cluster\_configuration](#input\_compute\_cluster\_configuration) | Kubernetes configuration for the externalized compute cluster | <pre>object({<br/>    kube_api_authorized_ip_ranges = optional(set(string))<br/>    outbound_type                 = optional(string)<br/>    private_cluster               = optional(bool)<br/>    worker_node_subnets           = optional(set(string))<br/>  })</pre> | `null` | no |
+| <a name="input_compute_cluster_configuration"></a> [compute\_cluster\_configuration](#input\_compute\_cluster\_configuration) | Kubernetes configuration for the externalized compute cluster. If not specified, a default configuration suitable for the requested deployment template will be used. | <pre>object({<br/>    kube_api_authorized_ip_ranges = optional(set(string))<br/>    outbound_type                 = optional(string)<br/>    private_cluster               = optional(bool)<br/>    worker_node_subnets           = optional(set(string))<br/>  })</pre> | `null` | no |
 | <a name="input_compute_cluster_enabled"></a> [compute\_cluster\_enabled](#input\_compute\_cluster\_enabled) | Enable externalized compute cluster for the environment | `bool` | `false` | no |
 | <a name="input_create_vnet"></a> [create\_vnet](#input\_create\_vnet) | Flag to specify if the VNet should be created | `bool` | `true` | no |
 | <a name="input_datalake_async_creation"></a> [datalake\_async\_creation](#input\_datalake\_async\_creation) | Flag to specify if Terraform should wait for CDP datalake resource creation/deletion | `bool` | `false` | no |

azure/main.tf

@@ -95,7 +95,7 @@ module "cdp_deploy" {
   cdp_groups          = local.cdp_groups
 
   compute_cluster_enabled       = var.compute_cluster_enabled
-  compute_cluster_configuration = var.compute_cluster_configuration
+  compute_cluster_configuration = local.compute_cluster_configuration
 
   environment_async_creation = var.environment_async_creation
   datalake_async_creation    = var.datalake_async_creation
@@ -205,3 +205,15 @@ locals {
     }
   ])
 }
+
+# ------- Set default compute cluster configuration if enabled
+locals {
+  compute_cluster_configuration = var.compute_cluster_enabled ? (
+    var.compute_cluster_configuration != null ? var.compute_cluster_configuration : {
+      kube_api_authorized_ip_ranges = var.deployment_template == "private" ? null : toset(local.ingress_extra_cidrs_and_ports.cidrs)
+      worker_node_subnets           = module.cdp_azure_prereqs.azure_cdp_subnet_names
+      private_cluster               = var.deployment_template == "private" ? true : false
+      outbound_type                 = ""
+    }
+  ) : null
+}

azure/variables.tf

@@ -195,7 +195,7 @@ variable "compute_cluster_configuration" {
     worker_node_subnets           = optional(set(string))
   })
 
-  description = "Kubernetes configuration for the externalized compute cluster"
+  description = "Kubernetes configuration for the externalized compute cluster. If not specified, a default configuration suitable for the requested deployment template will be used."
 
   default = null
 }