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

Author: pst

.github/workflows/main.yml

@@ -173,7 +173,7 @@ jobs:
         sed -i 's/region = ""/region = "eu-west-1"/g' eks_zero_providers.tf || true
 
         # EKS: set cluster_availability_zones
-        sed -i 's/cluster_availability_zones = ""/cluster_availability_zones = "eu-west-1a,eu-west-1b"/g' eks_zero_cluster.tf || true
+        sed -i 's/cluster_availability_zones = \[\]/cluster_availability_zones = ["eu-west-1a", "eu-west-1b", "eu-west-1c"]/g' eks_zero_cluster.tf || true
 
         # GKE: set project_id
         sed -i 's/project_id = ""/project_id = "terraform-kubestack-testing"/g' gke_zero_cluster.tf || true
@@ -182,11 +182,12 @@ jobs:
         sed -i 's/region = ""/region = "europe-west1"/g' gke_zero_cluster.tf || true
 
         # GKE: set cluster_node_locations
-        sed -i 's/cluster_node_locations = ""/cluster_node_locations = "europe-west1-b,europe-west1-c,europe-west1-d"/g' gke_zero_cluster.tf || true
+        sed -i 's/cluster_node_locations = \[\]/cluster_node_locations = ["europe-west1-b", "europe-west1-c", "europe-west1-d"]/g' gke_zero_cluster.tf || true
 
     - name: "Terraform init"
       working-directory: ./kubestack-starter-${{ matrix.starter }}
       run: |
+        cat *_cluster.tf
         docker run --rm \
           -v `pwd`:/infra \
           test-image:${{ github.sha }} \

aws/_modules/eks/master.tf

@@ -4,7 +4,7 @@ resource "aws_eks_cluster" "current" {
 
   vpc_config {
     security_group_ids      = [aws_security_group.masters.id]
-    subnet_ids              = aws_subnet.current.*.id
+    subnet_ids              = aws_subnet.current[*].id
     endpoint_private_access = var.cluster_endpoint_private_access
     endpoint_public_access  = var.cluster_endpoint_public_access
     public_access_cidrs     = var.cluster_public_access_cidrs

aws/_modules/eks/node_pool.tf

@@ -9,7 +9,7 @@ module "node_pool" {
 
   role_arn = aws_iam_role.node.arn
 
-  subnet_ids = var.vpc_legacy_node_subnets ? aws_subnet.current.*.id : aws_subnet.node_pool.*.id
+  subnet_ids = var.vpc_legacy_node_subnets ? aws_subnet.current[*].id : aws_subnet.node_pool[*].id
 
   instance_types = var.instance_types
   desired_size   = var.desired_capacity

aws/_modules/eks/node_pool/variables.tf

@@ -50,8 +50,8 @@ variable "disk_size" {
 }
 
 variable "subnet_ids" {
-  type        = list(string)
-  description = "List of VPC subnet IDs to use for nodes."
+  type        = set(string)
+  description = "Set of VPC subnet IDs to use for nodes."
 }
 
 variable "depends-on-aws-auth" {

aws/cluster/configuration.tf

@@ -1,11 +1,23 @@
+module "configuration" {
+  source = "../../common/configuration"
+
+  configuration = var.configuration
+  base_key      = var.configuration_base_key
+}
+
+locals {
+  # current workspace config
+  cfg = module.configuration.merged[terraform.workspace]
+}
+
 data "aws_region" "current" {
 }
 
 module "cluster_metadata" {
   source = "../../common/metadata"
 
-  name_prefix = local.name_prefix
-  base_domain = local.base_domain
+  name_prefix = local.cfg["name_prefix"]
+  base_domain = local.cfg["base_domain"]
 
   provider_name   = "aws"
   provider_region = data.aws_region.current.name
@@ -18,49 +30,63 @@ module "cluster" {
   metadata_fqdn   = module.cluster_metadata.fqdn
   metadata_labels = module.cluster_metadata.labels
 
-  availability_zones = local.cluster_availability_zones
-
-  vpc_cidr                      = local.cluster_vpc_cidr
-  vpc_control_subnet_newbits    = local.cluster_vpc_control_subnet_newbits
-  vpc_dns_hostnames             = local.cluster_vpc_dns_hostnames
-  vpc_dns_support               = local.cluster_vpc_dns_support
-  vpc_node_subnet_newbits       = local.cluster_vpc_node_subnet_newbits
-  vpc_node_subnet_number_offset = local.cluster_vpc_node_subnet_number_offset
-  vpc_legacy_node_subnets       = local.cluster_vpc_legacy_node_subnets
-  vpc_subnet_map_public_ip      = local.cluster_vpc_subnet_map_public_ip
-
-  instance_types   = local.cluster_instance_types
-  desired_capacity = local.cluster_desired_capacity
-  max_size         = local.cluster_max_size
-  min_size         = local.cluster_min_size
-  cluster_version  = local.cluster_version
-
-  metadata_options = local.metadata_options
-
-  root_device_encrypted   = local.worker_root_device_encrypted
-  root_device_volume_size = local.worker_root_device_volume_size
-
-  additional_node_tags = local.cluster_additional_node_tags
-
-  aws_auth_map_roles    = local.cluster_aws_auth_map_roles
-  aws_auth_map_users    = local.cluster_aws_auth_map_users
-  aws_auth_map_accounts = local.cluster_aws_auth_map_accounts
-
-  disable_default_ingress = local.disable_default_ingress
-
-  enabled_cluster_log_types = local.enabled_cluster_log_types
-
-  disable_openid_connect_provider = local.disable_openid_connect_provider
-
-  cluster_endpoint_private_access = local.cluster_endpoint_private_access
-  cluster_endpoint_public_access  = local.cluster_endpoint_public_access
-  cluster_public_access_cidrs     = local.cluster_public_access_cidrs
-  cluster_service_cidr            = local.cluster_service_cidr
-
-  cluster_encryption_key_arn = local.cluster_encryption_key_arn
-
-  worker_ami_type            = local.worker_ami_type
-  worker_ami_release_version = local.worker_ami_release_version
+  availability_zones = local.cfg["cluster_availability_zones"] != null ? 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
+
+  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"]
+  max_size         = local.cfg["cluster_max_size"]
+  min_size         = local.cfg["cluster_min_size"]
+  cluster_version  = local.cfg["cluster_version"]
+
+  metadata_options = (
+    local.cfg["metadata_options_http_endpoint"] != null ||
+    local.cfg["metadata_options_http_tokens"] != null ||
+    local.cfg["metadata_options_http_put_response_hop_limit"] != null ||
+    local.cfg["metadata_options_http_protocol_ipv6"] != null ||
+    local.cfg["metadata_options_instance_metadata_tags"] != null
+    ? {
+      http_endpoint               = local.cfg["metadata_options_http_endpoint"]
+      http_tokens                 = local.cfg["metadata_options_http_tokens"]
+      http_put_response_hop_limit = local.cfg["metadata_options_http_put_response_hop_limit"]
+      http_protocol_ipv6          = local.cfg["metadata_options_http_protocol_ipv6"]
+      instance_metadata_tags      = local.cfg["metadata_options_instance_metadata_tags"]
+    }
+    : null
+  )
+
+  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"] : {}
+
+  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"] : ""
+
+  disable_default_ingress = local.cfg["disable_default_ingress"] != null ? local.cfg["disable_default_ingress"] : false
+
+  enabled_cluster_log_types = local.cfg["enabled_cluster_log_types"] != null ? local.cfg["enabled_cluster_log_types"] : ["api", "audit", "authenticator", "controllerManager", "scheduler"]
+
+  disable_openid_connect_provider = local.cfg["disable_openid_connect_provider"] != null ? local.cfg["disable_openid_connect_provider"] : false
+
+  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_public_access_cidrs     = local.cfg["cluster_public_access_cidrs"]
+  cluster_service_cidr            = local.cfg["cluster_service_cidr"]
+
+  cluster_encryption_key_arn = local.cfg["cluster_encryption_key_arn"]
+
+  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

aws/cluster/main.tf

@@ -14,7 +14,7 @@ data "aws_vpc" "current" {
 }
 
 data "aws_subnets" "current" {
-  count = length(local.availability_zones) > 0 ? 1 : 0
+  count = length(local.cfg["availability_zones"]) > 0 ? 1 : 0
 
   filter {
     name   = "vpc-id"
@@ -25,7 +25,7 @@ data "aws_subnets" "current" {
   # only link subnet_ids belonging to these AZs
   filter {
     name   = "availability-zone"
-    values = local.availability_zones
+    values = local.cfg["availability_zones"]
   }
 
   # exclude control plane subnets
@@ -45,12 +45,12 @@ data "aws_internet_gateway" "current" {
 }
 
 data "aws_nat_gateway" "current" {
-  count = local.vpc_subnet_newbits == null ? 0 : local.vpc_subnet_map_public_ip == false ? length(local.availability_zones) : 0
+  count = local.vpc_subnet_newbits == null ? 0 : local.vpc_subnet_map_public_ip == false ? length(local.cfg["availability_zones"]) : 0
 
   vpc_id = data.aws_vpc.current.id
 
   tags = {
     "kubestack.com/cluster_name"          = data.aws_eks_cluster.current.name
-    "kubestack.com/cluster_provider_zone" = local.availability_zones[count.index]
+    "kubestack.com/cluster_provider_zone" = local.cfg["availability_zones"][count.index]
   }
 }