feat: adding aws zone info

lib/aws/bootstrap/documentdb.tf

@@ -12,7 +12,7 @@ locals {
 resource "aws_subnet" "documentdb_zone_a" {
   count = length(var.documentdb_subnets_zone_a)
 
-  availability_zone = data.aws_availability_zones.available.names[0]
+  availability_zone = var.aws_availability_zones[0]
   cidr_block = var.documentdb_subnets_zone_a[count.index]
   vpc_id = aws_vpc.eks.id
 
@@ -22,7 +22,7 @@ resource "aws_subnet" "documentdb_zone_a" {
 resource "aws_subnet" "documentdb_zone_b" {
   count = length(var.documentdb_subnets_zone_b)
 
-  availability_zone = data.aws_availability_zones.available.names[1]
+  availability_zone = var.aws_availability_zones[1]
   cidr_block = var.documentdb_subnets_zone_b[count.index]
   vpc_id = aws_vpc.eks.id
 
@@ -32,7 +32,7 @@ resource "aws_subnet" "documentdb_zone_b" {
 resource "aws_subnet" "documentdb_zone_c" {
   count = length(var.documentdb_subnets_zone_c)
 
-  availability_zone = data.aws_availability_zones.available.names[2]
+  availability_zone = var.aws_availability_zones[2]
   cidr_block = var.documentdb_subnets_zone_c[count.index]
   vpc_id = aws_vpc.eks.id
 

lib/aws/bootstrap/eks-vpc-with-nat-gateways.j2.tf

@@ -19,8 +19,7 @@ resource "aws_eip" "eip_zone_c" {
 resource "aws_subnet" "eks_zone_a_public" {
   count = length(var.eks_subnets_zone_a_public)
 
-  // todo: provide a static list in order to avoid a possible outage if AWS add a new zone
-  availability_zone = data.aws_availability_zones.available.names[0]
+  availability_zone = var.aws_availability_zones[0]
   cidr_block = var.eks_subnets_zone_a_public[count.index]
   vpc_id = aws_vpc.eks.id
   map_public_ip_on_launch = true
@@ -31,7 +30,7 @@ resource "aws_subnet" "eks_zone_a_public" {
 resource "aws_subnet" "eks_zone_b_public" {
   count = length(var.eks_subnets_zone_b_public)
 
-  availability_zone = data.aws_availability_zones.available.names[1]
+  availability_zone = var.aws_availability_zones[1]
   cidr_block = var.eks_subnets_zone_b_public[count.index]
   vpc_id = aws_vpc.eks.id
   map_public_ip_on_launch = true
@@ -42,7 +41,7 @@ resource "aws_subnet" "eks_zone_b_public" {
 resource "aws_subnet" "eks_zone_c_public" {
   count = length(var.eks_subnets_zone_c_public)
 
-  availability_zone = data.aws_availability_zones.available.names[2]
+  availability_zone = var.aws_availability_zones[2]
   cidr_block = var.eks_subnets_zone_c_public[count.index]
   vpc_id = aws_vpc.eks.id
   map_public_ip_on_launch = true
@@ -123,7 +122,7 @@ resource "aws_route_table_association" "eks_cluster_zone_c_public" {
 resource "aws_subnet" "eks_zone_a" {
   count = length(var.eks_subnets_zone_a_private)
 
-  availability_zone = data.aws_availability_zones.available.names[0]
+  availability_zone = var.aws_availability_zones[0]
   cidr_block = var.eks_subnets_zone_a_private[count.index]
   vpc_id = aws_vpc.eks.id
   map_public_ip_on_launch = false
@@ -134,7 +133,7 @@ resource "aws_subnet" "eks_zone_a" {
 resource "aws_subnet" "eks_zone_b" {
   count = length(var.eks_subnets_zone_b_private)
 
-  availability_zone = data.aws_availability_zones.available.names[1]
+  availability_zone = var.aws_availability_zones[1]
   cidr_block = var.eks_subnets_zone_b_private[count.index]
   vpc_id = aws_vpc.eks.id
   map_public_ip_on_launch = false
@@ -145,7 +144,7 @@ resource "aws_subnet" "eks_zone_b" {
 resource "aws_subnet" "eks_zone_c" {
   count = length(var.eks_subnets_zone_c_private)
 
-  availability_zone = data.aws_availability_zones.available.names[2]
+  availability_zone = var.aws_availability_zones[2]
   cidr_block = var.eks_subnets_zone_c_private[count.index]
   vpc_id = aws_vpc.eks.id
   map_public_ip_on_launch = false

lib/aws/bootstrap/eks-vpc-without-nat-gateways.j2.tf

@@ -3,7 +3,7 @@
 resource "aws_subnet" "eks_zone_a" {
   count = length(var.eks_subnets_zone_a_private)
 
-  availability_zone = data.aws_availability_zones.available.names[0]
+  availability_zone = var.aws_availability_zones[0]
   cidr_block = var.eks_subnets_zone_a_private[count.index]
   vpc_id = aws_vpc.eks.id
   map_public_ip_on_launch = true
@@ -14,7 +14,7 @@ resource "aws_subnet" "eks_zone_a" {
 resource "aws_subnet" "eks_zone_b" {
   count = length(var.eks_subnets_zone_b_private)
 
-  availability_zone = data.aws_availability_zones.available.names[1]
+  availability_zone = var.aws_availability_zones[1]
   cidr_block = var.eks_subnets_zone_b_private[count.index]
   vpc_id = aws_vpc.eks.id
   map_public_ip_on_launch = true
@@ -25,7 +25,7 @@ resource "aws_subnet" "eks_zone_b" {
 resource "aws_subnet" "eks_zone_c" {
   count = length(var.eks_subnets_zone_c_private)
 
-  availability_zone = data.aws_availability_zones.available.names[2]
+  availability_zone = var.aws_availability_zones[2]
   cidr_block = var.eks_subnets_zone_c_private[count.index]
   vpc_id = aws_vpc.eks.id
   map_public_ip_on_launch = true

lib/aws/bootstrap/elasticcache.tf

@@ -12,7 +12,7 @@ locals {
 resource "aws_subnet" "elasticache_zone_a" {
   count = length(var.elasticache_subnets_zone_a)
 
-  availability_zone = data.aws_availability_zones.available.names[0]
+  availability_zone = var.aws_availability_zones[0]
   cidr_block = var.elasticache_subnets_zone_a[count.index]
   vpc_id = aws_vpc.eks.id
 
@@ -22,7 +22,7 @@ resource "aws_subnet" "elasticache_zone_a" {
 resource "aws_subnet" "elasticache_zone_b" {
   count = length(var.elasticache_subnets_zone_b)
 
-  availability_zone = data.aws_availability_zones.available.names[1]
+  availability_zone = var.aws_availability_zones[1]
   cidr_block = var.elasticache_subnets_zone_b[count.index]
   vpc_id = aws_vpc.eks.id
 
@@ -32,7 +32,7 @@ resource "aws_subnet" "elasticache_zone_b" {
 resource "aws_subnet" "elasticache_zone_c" {
   count = length(var.elasticache_subnets_zone_c)
 
-  availability_zone = data.aws_availability_zones.available.names[2]
+  availability_zone = var.aws_availability_zones[2]
   cidr_block = var.elasticache_subnets_zone_c[count.index]
   vpc_id = aws_vpc.eks.id
 

lib/aws/bootstrap/elasticsearch.tf

@@ -12,7 +12,7 @@ locals {
 resource "aws_subnet" "elasticsearch_zone_a" {
   count = length(var.elasticsearch_subnets_zone_a)
 
-  availability_zone = data.aws_availability_zones.available.names[0]
+  availability_zone = var.aws_availability_zones[0]
   cidr_block = var.elasticsearch_subnets_zone_a[count.index]
   vpc_id = aws_vpc.eks.id
 
@@ -22,7 +22,7 @@ resource "aws_subnet" "elasticsearch_zone_a" {
 resource "aws_subnet" "elasticsearch_zone_b" {
   count = length(var.elasticsearch_subnets_zone_b)
 
-  availability_zone = data.aws_availability_zones.available.names[1]
+  availability_zone = var.aws_availability_zones[1]
   cidr_block = var.elasticsearch_subnets_zone_b[count.index]
   vpc_id = aws_vpc.eks.id
 
@@ -32,7 +32,7 @@ resource "aws_subnet" "elasticsearch_zone_b" {
 resource "aws_subnet" "elasticsearch_zone_c" {
   count = length(var.elasticsearch_subnets_zone_c)
 
-  availability_zone = data.aws_availability_zones.available.names[2]
+  availability_zone = var.aws_availability_zones[2]
   cidr_block = var.elasticsearch_subnets_zone_c[count.index]
   vpc_id = aws_vpc.eks.id
 

lib/aws/bootstrap/rds.tf

@@ -26,7 +26,7 @@ locals {
 resource "aws_subnet" "rds_zone_a" {
   count = length(var.rds_subnets_zone_a)
 
-  availability_zone = data.aws_availability_zones.available.names[0]
+  availability_zone = var.aws_availability_zones[0]
   cidr_block        = var.rds_subnets_zone_a[count.index]
   vpc_id            = aws_vpc.eks.id
 
@@ -36,7 +36,7 @@ resource "aws_subnet" "rds_zone_a" {
 resource "aws_subnet" "rds_zone_b" {
   count = length(var.rds_subnets_zone_b)
 
-  availability_zone = data.aws_availability_zones.available.names[1]
+  availability_zone = var.aws_availability_zones[1]
   cidr_block        = var.rds_subnets_zone_b[count.index]
   vpc_id            = aws_vpc.eks.id
 
@@ -46,7 +46,7 @@ resource "aws_subnet" "rds_zone_b" {
 resource "aws_subnet" "rds_zone_c" {
   count = length(var.rds_subnets_zone_c)
 
-  availability_zone = data.aws_availability_zones.available.names[2]
+  availability_zone = var.aws_availability_zones[2]
   cidr_block        = var.rds_subnets_zone_c[count.index]
   vpc_id            = aws_vpc.eks.id
 

lib/aws/bootstrap/tf-default-vars.j2.tf

@@ -44,6 +44,12 @@ variable "test_cluster" {
 
 # AWS specific
 
+variable "aws_availability_zones" {
+  description = "AWS availability zones"
+  default = {{ aws_availability_zones }}
+  type = list(string)
+}
+
 variable "vpc_cidr_block" {
   description = "VPC CIDR block"
   default = "{{ vpc_cidr_block }}"