From 4b09e95d88d95722b7f89bccb0e1def8fd26ad10 Mon Sep 17 00:00:00 2001 From: chenrui Date: Wed, 17 Oct 2018 04:30:47 -0400 Subject: [PATCH] Adjust the order and correct/update the info (#163) * Adjust the order and correct/update the info * Ensure the file alignment * Add change to changelog --- CHANGELOG.md | 1 + local.tf | 115 ++++++++++++++++++++++++++------------------------- 2 files changed, 59 insertions(+), 57 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 034932f..82b71e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ project adheres to [Semantic Versioning](http://semver.org/). ### Changed - A subtle but thoughtful change. (Boomshakalaka, @self 🏀) +- Adjust the order and correct/update the ec2 instance type info. (@chenrui333) ## [[v1.7.0](https://github.com/terraform-aws-modules/terraform-aws-eks/compare/v1.6.0...v1.7.0)] - 2018-10-09] diff --git a/local.tf b/local.tf index feda20b..82da5fd 100644 --- a/local.tf +++ b/local.tf @@ -41,125 +41,126 @@ locals { ebs_optimized = { "c1.medium" = false "c1.xlarge" = true + "c3.large" = false + "c3.xlarge" = true "c3.2xlarge" = true "c3.4xlarge" = true "c3.8xlarge" = false - "c3.large" = false - "c3.xlarge" = false + "c4.large" = true + "c4.xlarge" = true "c4.2xlarge" = true "c4.4xlarge" = true "c4.8xlarge" = true - "c4.large" = true - "c4.xlarge" = true - "c5.18xlarge" = true + "c5.large" = true + "c5.xlarge" = true "c5.2xlarge" = true "c5.4xlarge" = true "c5.9xlarge" = true - "c5.large" = true - "c5.xlarge" = true - "c5d.18xlarge" = true + "c5.18xlarge" = true + "c5d.large" = true + "c5d.xlarge" = true "c5d.2xlarge" = true "c5d.4xlarge" = true "c5d.9xlarge" = true - "c5d.large" = true - "c5d.xlarge" = true + "c5d.18xlarge" = true "cc2.8xlarge" = false "cr1.8xlarge" = false + "d2.xlarge" = true "d2.2xlarge" = true "d2.4xlarge" = true "d2.8xlarge" = true - "d2.xlarge" = true - "f1.16xlarge" = true "f1.2xlarge" = true + "f1.4xlarge" = true + "f1.16xlarge" = true "g2.2xlarge" = true "g2.8xlarge" = false - "g3.16xlarge" = true "g3.4xlarge" = true "g3.8xlarge" = true - "h1.16xlarge" = true + "g3.16xlarge" = true "h1.2xlarge" = true "h1.4xlarge" = true "h1.8xlarge" = true + "h1.16xlarge" = true "hs1.8xlarge" = false + "i2.xlarge" = true "i2.2xlarge" = true "i2.4xlarge" = true "i2.8xlarge" = false - "i2.xlarge" = true - "i3.16xlarge" = true + "i3.large" = true + "i3.xlarge" = true "i3.2xlarge" = true "i3.4xlarge" = true "i3.8xlarge" = true - "i3.large" = true + "i3.16xlarge" = true "i3.metal" = true - "i3.xlarge" = true - "m1.large" = true - "m1.medium" = false "m1.small" = false + "m1.medium" = false + "m1.large" = true "m1.xlarge" = true - "m2.2large" = false + "m2.xlarge" = false "m2.2xlarge" = true "m2.4xlarge" = true - "m2.xlarge" = false - "m3.2xlarge" = true - "m3.large" = false "m3.medium" = false + "m3.large" = false "m3.xlarge" = true - "m4.10xlarge" = true - "m4.16xlarge" = true - "m4.2xlarge" = true - "m4.4xlarge" = true + "m3.2xlarge" = true "m4.large" = true "m4.xlarge" = true - "m5.12xlarge" = true - "m5.24xlarge" = true - "m5.2xlarge" = true - "m5.4xlarge" = true + "m4.2xlarge" = true + "m4.4xlarge" = true + "m4.10xlarge" = true + "m4.16xlarge" = true "m5.large" = true "m5.xlarge" = true - "m5d.12xlarge" = true - "m5d.24xlarge" = true - "m5d.2xlarge" = true - "m5d.4xlarge" = true + "m5.2xlarge" = true + "m5.4xlarge" = true + "m5.9xlarge" = true + "m5.18xlarge" = true "m5d.large" = true "m5d.xlarge" = true - "p2.16xlarge" = true - "p2.8xlarge" = true + "m5d.2xlarge" = true + "m5d.4xlarge" = true + "m5d.12xlarge" = true + "m5d.24xlarge" = true "p2.xlarge" = true - "p3.16xlarge" = true + "p2.8xlarge" = true + "p2.16xlarge" = true "p3.2xlarge" = true "p3.8xlarge" = true - "r3.2xlarge" = false + "p3.16xlarge" = true + "r3.large" = false + "r3.xlarge" = true "r3.2xlarge" = true "r3.4xlarge" = true "r3.8xlarge" = false - "r3.large" = false - "r3.xlarge" = true - "r4.16xlarge" = true + "r4.large" = true + "r4.xlarge" = true "r4.2xlarge" = true "r4.4xlarge" = true "r4.8xlarge" = true - "r4.large" = true - "r4.xlarge" = true + "r4.16xlarge" = true "t1.micro" = false - "t2.2xlarge" = false - "t2.large" = false - "t2.medium" = false - "t2.micro" = false "t2.nano" = false + "t2.micro" = false "t2.small" = false + "t2.medium" = false + "t2.large" = false "t2.xlarge" = false - "t3.small" = false - "t3.medium" = false - "t3.large" = false - "t3.xlarge" = false - "t3.2xlarge" = false + "t2.2xlarge" = false + "t3.nano" = true + "t3.micro" = true + "t3.small" = true + "t3.medium" = true + "t3.large" = true + "t3.xlarge" = true + "t3.2xlarge" = true "x1.16xlarge" = true "x1.32xlarge" = true - "x1e.16xlarge" = true + "x1e.xlarge" = true "x1e.2xlarge" = true - "x1e.32xlarge" = true "x1e.4xlarge" = true "x1e.8xlarge" = true - "x1e.xlarge" = true + "x1e.16xlarge" = true + "x1e.32xlarge" = true } }