From c08ee3ea037439c929fe8b3940b6b52b4543decd Mon Sep 17 00:00:00 2001 From: Bill Monkman Date: Wed, 9 Sep 2020 15:32:11 -0700 Subject: [PATCH 1/2] Bump eks version, fix url in ami comment, remove unnecessary message during apply --- templates/Makefile | 2 +- templates/kubernetes/terraform/environments/prod/main.tf | 1 + templates/terraform/environments/prod/main.tf | 4 ++-- templates/terraform/environments/stage/main.tf | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/templates/Makefile b/templates/Makefile index f118f7e..0947e55 100644 --- a/templates/Makefile +++ b/templates/Makefile @@ -11,7 +11,7 @@ apply-remote-state: rm ./terraform.tfstate) apply-secrets: - aws iam list-access-keys --user-name $(PROJECT)-ci-user > /dev/null || (\ + aws iam list-access-keys --user-name $(PROJECT)-ci-user > /dev/null 2>&1 || (\ cd terraform/bootstrap/secrets && \ terraform init && \ terraform apply $(AUTO_APPROVE) && \ diff --git a/templates/kubernetes/terraform/environments/prod/main.tf b/templates/kubernetes/terraform/environments/prod/main.tf index 7f06c88..018ee79 100644 --- a/templates/kubernetes/terraform/environments/prod/main.tf +++ b/templates/kubernetes/terraform/environments/prod/main.tf @@ -42,3 +42,4 @@ module "kubernetes" { } # could be more policies defined here (if have) ] +} diff --git a/templates/terraform/environments/prod/main.tf b/templates/terraform/environments/prod/main.tf index 27165b1..1251977 100644 --- a/templates/terraform/environments/prod/main.tf +++ b/templates/terraform/environments/prod/main.tf @@ -24,13 +24,13 @@ module "prod" { ecr_repositories = [] # Should be created by the staging environment # EKS configuration - eks_cluster_version = "1.16" + eks_cluster_version = "1.17" eks_worker_instance_type = "t3.medium" eks_worker_asg_min_size = 2 eks_worker_asg_max_size = 4 # EKS-Optimized AMI for your region: https://docs.aws.amazon.com/eks/latest/userguide/eks-optimized-ami.html - # https://us-east-1.console.aws.amazon.com/systems-manager/parameters/%252Faws%252Fservice%252Feks%252Foptimized-ami%252F1.15%252Famazon-linux-2%252Frecommended%252Fimage_id/description?region=us-east-1 + # https://<% index .Params `region` %>.console.aws.amazon.com/systems-manager/parameters/%252Faws%252Fservice%252Feks%252Foptimized-ami%252F1.17%252Famazon-linux-2%252Frecommended%252Fimage_id/description?region=<% index .Params `region` %> eks_worker_ami = "<% index .Params `eksWorkerAMI` %>" # Hosting configuration diff --git a/templates/terraform/environments/stage/main.tf b/templates/terraform/environments/stage/main.tf index d5f8d9c..045d6ad 100644 --- a/templates/terraform/environments/stage/main.tf +++ b/templates/terraform/environments/stage/main.tf @@ -24,13 +24,13 @@ module "stage" { ecr_repositories = [ "<% .Name %>" ] # EKS configuration - eks_cluster_version = "1.16" + eks_cluster_version = "1.17" eks_worker_instance_type = "t3.medium" eks_worker_asg_min_size = 1 eks_worker_asg_max_size = 3 # EKS-Optimized AMI for your region: https://docs.aws.amazon.com/eks/latest/userguide/eks-optimized-ami.html - # https://us-east-1.console.aws.amazon.com/systems-manager/parameters/%252Faws%252Fservice%252Feks%252Foptimized-ami%252F1.15%252Famazon-linux-2%252Frecommended%252Fimage_id/description?region=us-east-1 + # https://<% index .Params `region` %>.console.aws.amazon.com/systems-manager/parameters/%252Faws%252Fservice%252Feks%252Foptimized-ami%252F1.17%252Famazon-linux-2%252Frecommended%252Fimage_id/description?region=<% index .Params `region` %> eks_worker_ami = "<% index .Params `eksWorkerAMI` %>" # Hosting configuration From bc49fa35d50df76d4b53875ede7b8edb91313f2d Mon Sep 17 00:00:00 2001 From: Bill Monkman Date: Wed, 9 Sep 2020 16:00:34 -0700 Subject: [PATCH 2/2] Bump eks module version to 0.0.2 --- templates/terraform/modules/environment/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/terraform/modules/environment/main.tf b/templates/terraform/modules/environment/main.tf index aa0d6a2..1e744a5 100644 --- a/templates/terraform/modules/environment/main.tf +++ b/templates/terraform/modules/environment/main.tf @@ -27,7 +27,7 @@ data "aws_caller_identity" "current" {} # Provision the EKS cluster module "eks" { source = "commitdev/zero/aws//modules/eks" - version = "0.0.1" + version = "0.0.2" project = var.project environment = var.environment