EKS Upgrade + Subnet changes (#115)

Author: pk0331

modules/aws/eks/main.tf

@@ -31,10 +31,24 @@ locals {
     instance_types = [v.instance_type]
     name_prefix   = "${v.ng_name}-art-"
     version = var.cluster.version
+    #subnets = var.vpc.private_secondary_subnets != null ? var.vpc.private_secondary_subnets : var.vpc.subnets
+    subnets = length(data.aws_subnets.private_secondary.ids) > 0 ?  data.aws_subnets.private_secondary.ids : var.vpc.subnets
     k8s_labels = merge(v.k8s_labels, { Environment = var.env })
   }, v)}
 }
 
+##Read the secondary subnets
+data "aws_subnets" "private_secondary" {
+  filter {
+    name   = "vpc-id"
+    values = [var.vpc.id]
+  }
+
+  tags = {
+    Type = "private_secondary"
+  }
+}
+
 module "eks" {
   source = "github.com/argonautdev/terraform-eks?ref=v17.4.1"
   cluster_name             = var.cluster.name

modules/aws/eks/variables.tf

@@ -40,6 +40,7 @@ variable "vpc" {
     name    = string
     id      = string
     subnets = list(string)
+    private_secondary_subnets = optional(list(string))
   })
 }
 

modules/aws/vpc/default/main.tf

@@ -1,8 +1,7 @@
 data "aws_availability_zones" "available" {}
 
 module "vpc" {
-  source = "terraform-aws-modules/vpc/aws"
-  version = "v3.11.0"
+  source = "github.com/argonautdev/terraform-aws-vpc?ref=v5.1.1"
 
   name = var.name
   # cidr = "10.0.0.0/16"
@@ -13,16 +12,17 @@ module "vpc" {
   // public_subnets  = slice(var.public_subnet_cidr_blocks, 0, var.public_subnet_count)
   public_subnets  = var.public_subnet_cidr_blocks
   private_subnets = var.private_subnet_cidr_blocks
+  private_secondary_subnets = var.secondary_cidr_subnet_blocks
   database_subnets = var.database_subnet_cidr_blocks
   elasticache_subnets = var.elasticache_subnet_cidr_blocks
   #   redshift_subnets    = ["20.10.41.0/24", "20.10.42.0/24", "20.10.43.0/24"]
   #   intra_subnets       = ["20.10.51.0/24", "20.10.52.0/24", "20.10.53.0/24"]
   create_database_subnet_group = true
   create_elasticache_subnet_group = true
   // create_private_subnet_group = true
-
+  secondary_cidr_blocks    = var.secondary_cidr_blocks
+  
 
-
   manage_default_route_table = true
   default_route_table_tags   = { DefaultRouteTable = true }
 

modules/aws/vpc/default/outputs.tf

@@ -26,3 +26,7 @@ output "database_subnets" {
 output "elasticache_subnets" {
   value = module.vpc.elasticache_subnets
 }
+
+output "private_secondary_subnets" {
+  value = module.vpc.private_secondary_subnets
+}

modules/aws/vpc/default/provider.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.67.0"
+      version = "~> 5.0.0"
     }
   }
 }

modules/aws/vpc/default/variables.tf

@@ -23,6 +23,20 @@ variable "enable_vpn_gateway" {
   type        = bool
 }
 
+variable "secondary_cidr_blocks" {
+  description = "List of secondary CIDR blocks to associate with the VPC to extend the IP Address pool"
+  type        = list(string)
+  default     = ["10.10.0.0/16"]
+}
+
+variable "secondary_cidr_subnet_blocks" {
+  description = "List of secondary subnet CIDR blocks to associate with the VPC to extend the IP Address pool"
+  type        = list(string)
+  # default     = []
+  default     = ["10.10.0.0/18", "10.10.64.0/18", "10.10.128.0/18" ]
+}
+
+
 variable "enable_dns_hostnames" {
   description = "Enable DNS hostnames in the VPC."
   type        = bool