fixup! Migrate cluster modules from map(map(string)) to map(object)

Author: pst

aws/_modules/eks/node_pool/variables.tf

@@ -88,7 +88,6 @@ variable "ami_type" {
 variable "ami_release_version" {
   type        = string
   description = "AMI version of the EKS Node Group. Defaults to latest version for Kubernetes version"
-  default     = null
 }
 
 variable "kubernetes_version" {

aws/_modules/eks/variables.tf

@@ -16,11 +16,13 @@ variable "metadata_labels" {
 variable "availability_zones" {
   description = "List of availability_zones for workers."
   type        = list(string)
+  default     = []
 }
 
 variable "vpc_cidr" {
   description = "CIDR to use for the VPC."
   type        = string
+  default     = "10.0.0.0/16"
 }
 
 variable "vpc_legacy_node_subnets" {
@@ -32,51 +34,61 @@ variable "vpc_legacy_node_subnets" {
 variable "vpc_control_subnet_newbits" {
   description = "CIDR newbits to use for the control plane subnets."
   type        = string
+  default     = "8"
 }
 
 variable "vpc_dns_hostnames" {
   description = "Enable DNS hostnames in the VPC."
   type        = bool
+  default     = false
 }
 
 variable "vpc_dns_support" {
   description = "Enable DNS support in the VPC."
   type        = bool
+  default     = true
 }
 
 variable "vpc_node_subnet_newbits" {
   description = "CIDR newbits to use for the node pool subnets."
   type        = string
+  default     = "4"
 }
 
 variable "vpc_node_subnet_number_offset" {
   description = "CIDR subnet number offset to use for the node pool subnets."
   type        = string
+  default     = "1"
 }
 
 variable "vpc_subnet_map_public_ip" {
   description = "Whether nodes should have public IPs."
   type        = bool
+  default     = true
 }
 
 variable "instance_types" {
   description = "Set of AWS instance types to use for nodes."
   type        = set(string)
+  default     = []
 }
 
 variable "desired_capacity" {
   description = "Desired number of worker nodes."
   type        = number
+  default     = 1
 }
 
 variable "max_size" {
   description = "Maximum number of worker nodes."
   type        = number
+  default     = 1
 }
 
 variable "min_size" {
   description = "Minimum number of worker nodes."
   type        = number
+  default     = 1
 }
 
 variable "root_device_encrypted" {
@@ -109,36 +121,41 @@ variable "additional_node_tags" {
 variable "aws_auth_map_roles" {
   description = "mapRoles entries added to aws-auth configmap"
   type        = string
+  default     = ""
 }
 
 variable "aws_auth_map_users" {
   description = "mapUsers entries added to aws-auth configmap"
   type        = string
+  default     = ""
 }
 
 variable "aws_auth_map_accounts" {
   description = "mapAccounts entries added to aws-auth configmap"
   type        = string
+  default     = ""
 }
 
 variable "disable_default_ingress" {
   type        = bool
   description = "Whether to disable the default ingress."
+  default     = false
 }
 
 variable "enabled_cluster_log_types" {
   type        = list(string)
   description = "List of cluster log types to enable."
+  default     = ["api", "audit", "authenticator", "controllerManager", "scheduler"]
 }
 
 variable "disable_openid_connect_provider" {
   type        = bool
   description = "Whether to disable the OpenID connect provider."
+  default     = false
 }
 
 variable "cluster_version" {
   type        = string
-  default     = null
   description = "The version of the cluster (defaults to latest available)"
 }
 
@@ -156,31 +173,26 @@ variable "cluster_endpoint_public_access" {
 
 variable "cluster_public_access_cidrs" {
   type        = list(string)
-  default     = null
   description = "List of CIDR blocks which can access the Amazon EKS public API server endpoint. EKS defaults this to a list with 0.0.0.0/0."
 }
 
 variable "cluster_service_cidr" {
   type        = string
-  default     = null
   description = "Sets the Service CIDR for the EKS cluster."
 }
 
 variable "cluster_encryption_key_arn" {
   type        = string
-  default     = null
   description = "Arn of an AWS KMS symmetric key to be used for encryption of kubernetes resources."
 }
 
 variable "worker_ami_type" {
   type        = string
-  default     = null
   description = "AMI type to use for nodes. Defaults to automatically determined based on instance type (AL2023_x86_64_STANDARD, AL2023_ARM_64_STANDARD, AL2023_x86_64_NVIDIA or AL2023_ARM_64_NVIDIA)."
 }
 
 variable "worker_ami_release_version" {
   type        = string
-  default     = null
   description = "AMI version of the EKS Node Group. Defaults to latest version for Kubernetes version. A list of release versions can be found in https://github.com/awslabs/amazon-eks-ami/blob/master/CHANGELOG.md"
 }
 

aws/cluster/main.tf

@@ -30,16 +30,16 @@ module "cluster" {
   metadata_fqdn   = module.cluster_metadata.fqdn
   metadata_labels = module.cluster_metadata.labels
 
-  availability_zones = local.cfg["cluster_availability_zones"] != null ? local.cfg["cluster_availability_zones"] : []
+  availability_zones = local.cfg["cluster_availability_zones"]
 
-  vpc_cidr                      = local.cfg["cluster_vpc_cidr"] != null ? local.cfg["cluster_vpc_cidr"] : "10.0.0.0/16"
-  vpc_control_subnet_newbits    = local.cfg["cluster_vpc_control_subnet_newbits"] != null ? local.cfg["cluster_vpc_control_subnet_newbits"] : local.cfg["cluster_vpc_subnet_newbits"] != null ? local.cfg["cluster_vpc_subnet_newbits"] : "8"
-  vpc_dns_hostnames             = local.cfg["cluster_vpc_dns_hostnames"] != null ? local.cfg["cluster_vpc_dns_hostnames"] : false
-  vpc_dns_support               = local.cfg["cluster_vpc_dns_support"] != null ? local.cfg["cluster_vpc_dns_support"] : true
-  vpc_node_subnet_newbits       = local.cfg["cluster_vpc_node_subnet_newbits"] != null ? local.cfg["cluster_vpc_node_subnet_newbits"] : "4"
-  vpc_node_subnet_number_offset = local.cfg["cluster_vpc_node_subnet_number_offset"] != null ? local.cfg["cluster_vpc_node_subnet_number_offset"] : "1"
-  vpc_legacy_node_subnets       = local.cfg["cluster_vpc_legacy_node_subnets"] != null ? local.cfg["cluster_vpc_legacy_node_subnets"] : false
-  vpc_subnet_map_public_ip      = local.cfg["cluster_vpc_subnet_map_public_ip"] != null ? local.cfg["cluster_vpc_subnet_map_public_ip"] : true
+  vpc_cidr                      = local.cfg["cluster_vpc_cidr"]
+  vpc_control_subnet_newbits    = local.cfg["cluster_vpc_control_subnet_newbits"]
+  vpc_dns_hostnames             = local.cfg["cluster_vpc_dns_hostnames"]
+  vpc_dns_support               = local.cfg["cluster_vpc_dns_support"]
+  vpc_node_subnet_newbits       = local.cfg["cluster_vpc_node_subnet_newbits"]
+  vpc_node_subnet_number_offset = local.cfg["cluster_vpc_node_subnet_number_offset"]
+  vpc_legacy_node_subnets       = local.cfg["cluster_vpc_legacy_node_subnets"]
+  vpc_subnet_map_public_ip      = local.cfg["cluster_vpc_subnet_map_public_ip"]
 
   instance_types   = local.cfg["cluster_instance_types"] != null ? toset(local.cfg["cluster_instance_types"]) : (local.cfg["cluster_instance_type"] != null ? toset([local.cfg["cluster_instance_type"]]) : toset([]))
   desired_capacity = local.cfg["cluster_desired_capacity"]
@@ -52,20 +52,20 @@ module "cluster" {
   root_device_encrypted   = local.cfg["worker_root_device_encrypted"]
   root_device_volume_size = local.cfg["worker_root_device_volume_size"]
 
-  additional_node_tags = local.cfg["cluster_additional_node_tags"] != null ? local.cfg["cluster_additional_node_tags"] : {}
+  additional_node_tags = local.cfg["cluster_additional_node_tags"]
 
-  aws_auth_map_roles    = local.cfg["cluster_aws_auth_map_roles"] != null ? local.cfg["cluster_aws_auth_map_roles"] : ""
-  aws_auth_map_users    = local.cfg["cluster_aws_auth_map_users"] != null ? local.cfg["cluster_aws_auth_map_users"] : ""
-  aws_auth_map_accounts = local.cfg["cluster_aws_auth_map_accounts"] != null ? local.cfg["cluster_aws_auth_map_accounts"] : ""
+  aws_auth_map_roles    = local.cfg["cluster_aws_auth_map_roles"]
+  aws_auth_map_users    = local.cfg["cluster_aws_auth_map_users"]
+  aws_auth_map_accounts = local.cfg["cluster_aws_auth_map_accounts"]
 
-  disable_default_ingress = local.cfg["disable_default_ingress"] != null ? local.cfg["disable_default_ingress"] : false
+  disable_default_ingress = local.cfg["disable_default_ingress"]
 
-  enabled_cluster_log_types = local.cfg["enabled_cluster_log_types"] != null ? local.cfg["enabled_cluster_log_types"] : ["api", "audit", "authenticator", "controllerManager", "scheduler"]
+  enabled_cluster_log_types = local.cfg["enabled_cluster_log_types"]
 
-  disable_openid_connect_provider = local.cfg["disable_openid_connect_provider"] != null ? local.cfg["disable_openid_connect_provider"] : false
+  disable_openid_connect_provider = local.cfg["disable_openid_connect_provider"]
 
-  cluster_endpoint_private_access = local.cfg["cluster_endpoint_private_access"] != null ? local.cfg["cluster_endpoint_private_access"] : false
-  cluster_endpoint_public_access  = local.cfg["cluster_endpoint_public_access"] != null ? local.cfg["cluster_endpoint_public_access"] : true
+  cluster_endpoint_private_access = local.cfg["cluster_endpoint_private_access"]
+  cluster_endpoint_public_access  = local.cfg["cluster_endpoint_public_access"]
   cluster_public_access_cidrs     = local.cfg["cluster_public_access_cidrs"]
   cluster_service_cidr            = local.cfg["cluster_service_cidr"]
 
@@ -74,8 +74,5 @@ module "cluster" {
   worker_ami_type            = local.cfg["worker_ami_type"]
   worker_ami_release_version = local.cfg["worker_ami_release_version"]
 
-  # cluster module configuration is still map(string)
-  # once module_variable_optional_attrs isn't experimental anymore
-  # we can migrate cluster module configuration to map(object(...))
   taints = toset([])
 }

aws/cluster/node-pool/main.tf

@@ -44,9 +44,9 @@ module "node_pool" {
 
   kubernetes_version = data.aws_eks_cluster.current.version
 
-  disk_size = lookup(local.cfg, "disk_size", null)
+  disk_size = local.cfg["disk_size"]
 
-  metadata_options = lookup(local.cfg, "metadata_options", null)
+  metadata_options = local.cfg["metadata_options"]
 
   taints = local.cfg["taints"] == null ? toset([]) : local.cfg["taints"]
 

azurerm/_modules/aks/variables.tf

@@ -32,26 +32,31 @@ variable "legacy_vnet_name" {
 variable "vnet_address_space" {
   type        = list(string)
   description = "Address space for the virtual network."
+  default     = ["10.0.0.0/8"]
 }
 
 variable "subnet_address_prefixes" {
   type        = list(string)
   description = "Address space for the cluster subnet."
+  default     = ["10.1.0.0/16"]
 }
 
 variable "subnet_service_endpoints" {
   type        = list(string)
   description = "List of service endpoints to expose on the subnet."
+  default     = []
 }
 
 variable "network_plugin" {
   type        = string
   description = "Network plugin to use. Set to 'azure' for CNI; 'kubenet' for Basic"
+  default     = "kubenet"
 }
 
 variable "network_policy" {
   type        = string
   description = "Network policy to use. Set to 'azure' for CNI; 'calico' for Basic"
+  default     = "calico"
 }
 
 variable "dns_prefix" {
@@ -63,16 +68,19 @@ variable "dns_prefix" {
 variable "service_cidr" {
   type        = string
   description = "CIDR range for kubernetes service."
+  default     = "10.0.0.0/16"
 }
 
 variable "dns_service_ip" {
   type        = string
   description = "IP address for the kube-dns service. Must be within service_cidr."
+  default     = "10.0.0.10"
 }
 
 variable "pod_cidr" {
   type        = string
   description = "CIDR range for pods."
+  default     = "10.244.0.0/16"
 }
 
 variable "max_pods" {
@@ -99,11 +107,13 @@ variable "default_node_pool" {
 variable "disable_default_ingress" {
   type        = bool
   description = "Whether to disable the default ingress."
+  default     = false
 }
 
 variable "default_ingress_ip_zones" {
   type        = list(string)
   description = "Explicit list of zones for the ingress public IP."
+  default     = []
 }
 
 variable "enable_azure_policy_agent" {
@@ -121,7 +131,6 @@ variable "disable_managed_identities" {
 variable "user_assigned_identity_id" {
   type        = string
   description = "ID of the UserAssigned identity to use."
-  default     = null
 }
 
 variable "sku_tier" {
@@ -156,11 +165,13 @@ variable "availability_zones" {
 variable "keda_enabled" {
   type        = bool
   description = "Whether KEDA Autoscaler should be enabled for the cluster."
+  default     = false
 }
 
 variable "vertical_pod_autoscaler_enabled" {
   type        = bool
   description = "Whether Vertical Pod Autoscaler should be enabled for the cluster."
+  default     = false
 }
 
 variable "upgrade_settings" {

azurerm/cluster/main.tf

@@ -34,43 +34,43 @@ module "cluster" {
 
   metadata_name            = module.cluster_metadata.name
   metadata_fqdn            = module.cluster_metadata.fqdn
-  metadata_labels          = merge(module.cluster_metadata.labels, local.cfg["additional_metadata_labels"])
+  metadata_labels          = merge(module.cluster_metadata.labels, coalesce(local.cfg["additional_metadata_labels"], {}))
   metadata_label_namespace = module.cluster_metadata.label_namespace
 
-  dns_prefix = local.cfg["dns_prefix"] != null ? local.cfg["dns_prefix"] : "api"
+  dns_prefix = local.cfg["dns_prefix"]
 
-  sku_tier = local.cfg["sku_tier"] != null ? local.cfg["sku_tier"] : "Free"
+  sku_tier = local.cfg["sku_tier"]
 
-  legacy_vnet_name         = local.cfg["legacy_vnet_name"] != null ? local.cfg["legacy_vnet_name"] : false
-  vnet_address_space       = local.cfg["vnet_address_space"] != null ? local.cfg["vnet_address_space"] : ["10.0.0.0/8"]
-  subnet_address_prefixes  = local.cfg["subnet_address_prefixes"] != null ? local.cfg["subnet_address_prefixes"] : ["10.1.0.0/16"]
-  subnet_service_endpoints = local.cfg["subnet_service_endpoints"] != null ? local.cfg["subnet_service_endpoints"] : []
+  legacy_vnet_name         = local.cfg["legacy_vnet_name"]
+  vnet_address_space       = local.cfg["vnet_address_space"]
+  subnet_address_prefixes  = local.cfg["subnet_address_prefixes"]
+  subnet_service_endpoints = local.cfg["subnet_service_endpoints"]
 
-  network_plugin = local.cfg["network_plugin"] != null ? local.cfg["network_plugin"] : "kubenet"
-  network_policy = local.cfg["network_policy"] != null ? local.cfg["network_policy"] : "calico"
-  service_cidr   = local.cfg["service_cidr"] != null ? local.cfg["service_cidr"] : "10.0.0.0/16"
-  dns_service_ip = local.cfg["dns_service_ip"] != null ? local.cfg["dns_service_ip"] : "10.0.0.10"
-  pod_cidr       = local.cfg["pod_cidr"] != null ? local.cfg["pod_cidr"] : "10.244.0.0/16"
+  network_plugin = local.cfg["network_plugin"]
+  network_policy = local.cfg["network_policy"]
+  service_cidr   = local.cfg["service_cidr"]
+  dns_service_ip = local.cfg["dns_service_ip"]
+  pod_cidr       = local.cfg["pod_cidr"]
   max_pods       = local.cfg["max_pods"]
 
-  default_node_pool = local.cfg["default_node_pool"] != null ? local.cfg["default_node_pool"] : {}
+  default_node_pool = local.cfg["default_node_pool"]
 
-  disable_default_ingress  = local.cfg["disable_default_ingress"] != null ? local.cfg["disable_default_ingress"] : false
-  default_ingress_ip_zones = local.cfg["default_ingress_ip_zones"] != null ? local.cfg["default_ingress_ip_zones"] : []
+  disable_default_ingress  = local.cfg["disable_default_ingress"]
+  default_ingress_ip_zones = local.cfg["default_ingress_ip_zones"]
 
-  enable_azure_policy_agent = local.cfg["enable_azure_policy_agent"] != null ? local.cfg["enable_azure_policy_agent"] : false
+  enable_azure_policy_agent = local.cfg["enable_azure_policy_agent"]
 
-  disable_managed_identities = local.cfg["disable_managed_identities"] != null ? local.cfg["disable_managed_identities"] : false
+  disable_managed_identities = local.cfg["disable_managed_identities"]
   user_assigned_identity_id  = local.cfg["user_assigned_identity_id"]
 
   kubernetes_version        = local.cfg["kubernetes_version"]
   automatic_channel_upgrade = local.cfg["automatic_channel_upgrade"]
-  enable_log_analytics      = local.cfg["enable_log_analytics"] != null ? local.cfg["enable_log_analytics"] : true
+  enable_log_analytics      = local.cfg["enable_log_analytics"]
 
   availability_zones = local.cfg["availability_zones"]
 
-  keda_enabled                    = local.cfg["keda_enabled"] != null ? local.cfg["keda_enabled"] : false
-  vertical_pod_autoscaler_enabled = local.cfg["vertical_pod_autoscaler_enabled"] != null ? local.cfg["vertical_pod_autoscaler_enabled"] : false
+  keda_enabled                    = local.cfg["keda_enabled"]
+  vertical_pod_autoscaler_enabled = local.cfg["vertical_pod_autoscaler_enabled"]
 
-  upgrade_settings = local.cfg["upgrade_settings"] != null ? local.cfg["upgrade_settings"] : {}
+  upgrade_settings = local.cfg["upgrade_settings"]
 }