Skip to content

Bump eks version, fix url in ami comment, remove unnecessary message … #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bmonkman merged 2 commits into from
Sep 9, 2020
Merged

Bump eks version, fix url in ami comment, remove unnecessary message … #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c08ee3e
Bump eks version, fix url in ami comment, remove unnecessary message …
bmonkman Sep 9, 2020
bc49fa3
Bump eks module version to 0.0.2
bmonkman Sep 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion templates/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) && \
Expand Down
1 change: 1 addition & 0 deletions templates/kubernetes/terraform/environments/prod/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,4 @@ module "kubernetes" {
}
# could be more policies defined here (if have)
]
}
4 changes: 2 additions & 2 deletions templates/terraform/environments/prod/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Copy Markdown
Contributor

@davidcheung davidcheung Sep 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/commitdev/zero-aws-eks-stack/blob/main/templates/terraform/modules/environment/main.tf#L30

can you help bump this to 0.0.2 as well

Copy link
Copy Markdown
Contributor Author

@bmonkman bmonkman Sep 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes! Thanks! I knew there was something else.

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
Expand Down
4 changes: 2 additions & 2 deletions templates/terraform/environments/stage/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion templates/terraform/modules/environment/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down