Cleanup and fixes to last EKS push (#74)

README.md

@@ -169,6 +169,9 @@ The following inputs can be used as `step.with` keys
 | `aws_vpc_availability_zones` | String | Comma separated list of availability zones. Defaults to `aws_default_region+<random>` value. If a list is defined, the first zone will be the one used for the EC2 instance. |
 | `aws_vpc_id` | String | **Existing** AWS VPC ID to use. Accepts `vpc-###` values. |
 | `aws_vpc_subnet_id` | String | **Existing** AWS VPC Subnet ID. If none provided, will pick one. (Ideal when there's only one). |
+| `aws_vpc_enable_nat_gateway` | String | Adds a NAT gateway for each public subnet. |
+| `aws_vpc_single_nat_gateway` | String | Toggles only one NAT gateway for all of the public subnets. |
+| `aws_vpc_external_nat_ip_ids` | String | **Existing** comma separated list of IP IDs if reusing. (ElasticIPs). |
 | `aws_vpc_additional_tags` | JSON | Add additional tags to the terraform [default tags](https://www.hashicorp.com/blog/default-tags-in-the-terraform-aws-provider), any tags put here will be added to vpc provisioned resources.|
 <hr/>
 <br/>
@@ -462,7 +465,6 @@ The following inputs can be used as `step.with` keys
 | Name             | Type    | Description                        |
 |------------------|---------|------------------------------------|
 | `aws_eks_create` | Boolean | Define if an EKS cluster should be created |
-| `aws_eks_region` | String | Define the region where EKS cluster should be created. Defaults to `us-east-1`. |
 | `aws_eks_security_group_name_master` | String | Define the security group name master. Defaults to `SG for ${var.aws_resource_identifier} - EKS Master`. |
 | `aws_eks_security_group_name_worker` | String | Define the security group name worker. Defaults to `SG for ${var.aws_resource_identifier} - EKS Worker`. |
 | `aws_eks_environment` | String | Specify the eks environment name. Defaults to `env` |

action.yaml

@@ -905,9 +905,6 @@ inputs:
   aws_eks_create:
     description: 'Define if an EKS cluster should be created'
     required: false
-  aws_eks_region:
-    description: 'Define the region where EKS cluster should be created'
-    required: false
   aws_eks_security_group_name_master:
     description:  "SG for ${var.aws_resource_identifier} - ${var.aws_eks_environment} - EKS Master"
     required: false
@@ -1412,7 +1409,6 @@ runs:
 
         # AWS EKS
         AWS_EKS_CREATE: ${{ inputs.aws_eks_create }}
-        AWS_EKS_REGION: ${{ inputs.aws_eks_region }}
         AWS_EKS_SECURITY_GROUP_NAME_MASTER: ${{ inputs.aws_eks_security_group_name_master }}
         AWS_EKS_SECURITY_GROUP_NAME_WORKER: ${{ inputs.aws_eks_security_group_name_worker }}
         AWS_EKS_ENVIRONMENT: ${{ inputs.aws_eks_environment }}

operations/_scripts/generate/generate_vars_terraform.sh

@@ -354,7 +354,6 @@ fi
 #-- EKS Cluster --#
 if [[ $(alpha_only "$AWS_EKS_CREATE") == true ]]; then
   aws_eks_create=$(generate_var aws_eks_create $AWS_EKS_CREATE)
-  aws_eks_region=$(generate_var aws_eks_region $AWS_EKS_REGION)
   aws_eks_security_group_name_master=$(generate_var aws_eks_security_group_name_master $AWS_EKS_SECURITY_GROUP_NAME_MASTER)
   aws_eks_security_group_name_worker=$(generate_var aws_eks_security_group_name_worker $AWS_EKS_SECURITY_GROUP_NAME_WORKER)
   aws_eks_environment=$(generate_var aws_eks_environment $AWS_EKS_ENVIRONMENT)
@@ -677,7 +676,6 @@ $aws_ecr_additional_tags
 
 #-- EKS --#
 $aws_eks_create
-$aws_eks_region
 $aws_eks_security_group_name_master
 $aws_eks_security_group_name_worker
 $aws_eks_environment

operations/deployment/terraform/aws/aws_variables.tf

@@ -1542,12 +1542,6 @@ variable "aws_eks_create" {
   default     = false
 }
 
-variable "aws_eks_region" {
-  description = "aws region name"
-  type        = string
-  default     = "us-east-1"
-}
-
 variable "aws_eks_security_group_name_master" {
   description = "aws aws_eks_security_group_name_master name"
   type        = string

operations/deployment/terraform/aws/bitovi_main.tf

@@ -594,7 +594,6 @@ module "eks" {
   count  = var.aws_eks_create ? 1 : 0
   # EKS
   #aws_eks_create                     = var.aws_eks_create
-  aws_eks_region                     = var.aws_eks_region
   aws_eks_security_group_name_master = var.aws_eks_security_group_name_master
   aws_eks_security_group_name_worker = var.aws_eks_security_group_name_worker
   aws_eks_environment                = var.aws_eks_environment

operations/deployment/terraform/modules/aws/eks/aws_eks_vars.tf

@@ -1,4 +1,3 @@
-variable "aws_eks_region" {}
 variable "aws_eks_security_group_name_master" {}
 variable "aws_eks_security_group_name_worker" {}
 variable "aws_eks_environment" {}