From 30e4c5ec9c1ffe0a927bdc38dc433650d400e20d Mon Sep 17 00:00:00 2001 From: brandoconnor Date: Mon, 11 Jun 2018 12:01:33 -0700 Subject: [PATCH] updated ebs optimized types to match that of the dedicated module --- local.tf | 145 +++++++++++++++++++++++++++++------------------------ workers.tf | 2 +- 2 files changed, 80 insertions(+), 67 deletions(-) diff --git a/local.tf b/local.tf index 9354131..ce706e7 100644 --- a/local.tf +++ b/local.tf @@ -65,110 +65,123 @@ locals { x1.32xlarge = 234 } - ebs_optimized_types = { - "c4.large" = true - "c4.xlarge" = true + ebs_optimized = { + "c1.medium" = false + "c1.xlarge" = true + "c3.2xlarge" = true + "c3.4xlarge" = true + "c3.8xlarge" = false + "c3.large" = false + "c3.xlarge" = false "c4.2xlarge" = true "c4.4xlarge" = true "c4.8xlarge" = true - "c5.large" = true - "c5.xlarge" = true + "c4.large" = true + "c4.xlarge" = true + "c5.18xlarge" = true "c5.2xlarge" = true "c5.4xlarge" = true "c5.9xlarge" = true - "c5.18xlarge" = true - "c5d.large" = true - "c5d.xlarge" = true + "c5.large" = true + "c5.xlarge" = true + "c5d.18xlarge" = true "c5d.2xlarge" = true "c5d.4xlarge" = true "c5d.9xlarge" = true - "c5d.18xlarge" = true - "d2.xlarge" = true + "c5d.large" = true + "c5d.xlarge" = true + "cc2.8xlarge" = false + "cr1.8xlarge" = false "d2.2xlarge" = true "d2.4xlarge" = true "d2.8xlarge" = true - "f1.2xlarge" = true + "d2.xlarge" = true "f1.16xlarge" = true + "f1.2xlarge" = true + "g2.2xlarge" = true + "g2.8xlarge" = false + "g3.16xlarge" = true "g3.4xlarge" = true "g3.8xlarge" = true - "g3.16xlarge" = true + "h1.16xlarge" = true "h1.2xlarge" = true "h1.4xlarge" = true "h1.8xlarge" = true - "h1.16xlarge" = true - "i3.large" = true - "i3.xlarge" = true + "hs1.8xlarge" = false + "i2.2xlarge" = true + "i2.4xlarge" = true + "i2.8xlarge" = false + "i2.xlarge" = true + "i3.16xlarge" = true "i3.2xlarge" = true "i3.4xlarge" = true "i3.8xlarge" = true - "i3.16xlarge" = true + "i3.large" = true "i3.metal" = true - "m4.large" = true - "m4.xlarge" = true - "m4.2xlarge" = true - "m4.4xlarge" = true + "i3.xlarge" = true + "m1.large" = true + "m1.medium" = false + "m1.small" = false + "m1.xlarge" = true + "m2.2large" = false + "m2.2xlarge" = true + "m2.4xlarge" = true + "m2.xlarge" = false + "m3.2xlarge" = true + "m3.large" = false + "m3.medium" = false + "m3.xlarge" = true "m4.10xlarge" = true "m4.16xlarge" = true - "m5.large" = true - "m5.xlarge" = true - "m5.2xlarge" = true - "m5.4xlarge" = true + "m4.2xlarge" = true + "m4.4xlarge" = true + "m4.large" = true + "m4.xlarge" = true "m5.12xlarge" = true "m5.24xlarge" = true - "m5d.large" = true - "m5d.xlarge" = true - "m5d.2xlarge" = true - "m5d.4xlarge" = true + "m5.2xlarge" = true + "m5.4xlarge" = true + "m5.large" = true + "m5.xlarge" = true "m5d.12xlarge" = true "m5d.24xlarge" = true - "p2.xlarge" = true - "p2.8xlarge" = true + "m5d.2xlarge" = true + "m5d.4xlarge" = true + "m5d.large" = true + "m5d.xlarge" = true "p2.16xlarge" = true + "p2.8xlarge" = true + "p2.xlarge" = true + "p3.16xlarge" = true "p3.2xlarge" = true "p3.8xlarge" = true - "p3.16xlarge" = true - "r4.large" = true - "r4.xlarge" = true + "r3.2xlarge" = false + "r3.2xlarge" = true + "r3.4xlarge" = true + "r3.8xlarge" = false + "r3.large" = false + "r3.xlarge" = true + "r4.16xlarge" = true "r4.2xlarge" = true "r4.4xlarge" = true "r4.8xlarge" = true - "r4.16xlarge" = true + "r4.large" = true + "r4.xlarge" = true + "t1.micro" = false + "t2.2xlarge" = false + "t2.large" = false + "t2.medium" = false + "t2.micro" = false + "t2.nano" = false + "t2.small" = false + "t2.xlarge" = false "x1.16xlarge" = true "x1.32xlarge" = true - "x1e.xlarge" = true + "x1e.16xlarge" = true "x1e.2xlarge" = true + "x1e.32xlarge" = true "x1e.4xlarge" = true "x1e.8xlarge" = true - "x1e.16xlarge" = true - "x1e.32xlarge" = true - "c5.large" = true - "c5.xlarge" = true - "c5.2xlarge" = true - "c5d.large" = true - "c5d.xlarge" = true - "c5d.2xlarge" = true - "m5.large" = true - "m5.xlarge" = true - "m5.2xlarge" = true - "m5d.large" = true - "m5d.xlarge" = true - "m5d.2xlarge" = true - "c1.xlarge" = true - "c3.xlarge" = true - "c3.2xlarge" = true - "c3.4xlarge" = true - "g2.2xlarge" = true - "i2.xlarge" = true - "i2.2xlarge" = true - "i2.4xlarge" = true - "m1.large" = true - "m1.xlarge" = true - "m2.2xlarge" = true - "m2.4xlarge" = true - "m3.xlarge" = true - "m3.2xlarge" = true - "r3.xlarge" = true - "r3.2xlarge" = true - "r3.4xlarge" = true + "x1e.xlarge" = true } } diff --git a/workers.tf b/workers.tf index 72dfb43..ae82fe8 100644 --- a/workers.tf +++ b/workers.tf @@ -24,7 +24,7 @@ resource "aws_launch_configuration" "workers" { image_id = "${lookup(var.worker_groups[count.index], "ami_id", data.aws_ami.eks_worker.id)}" instance_type = "${lookup(var.worker_groups[count.index], "instance_type", lookup(var.workers_group_defaults, "instance_type"))}" user_data_base64 = "${base64encode(element(data.template_file.userdata.*.rendered, count.index))}" - ebs_optimized = "${lookup(var.worker_groups[count.index], "ebs_optimized", lookup(local.ebs_optimized_types, lookup(var.worker_groups[count.index], "instance_type", lookup(var.workers_group_defaults, "instance_type")), false))}" + ebs_optimized = "${lookup(var.worker_groups[count.index], "ebs_optimized", lookup(local.ebs_optimized, lookup(var.worker_groups[count.index], "instance_type", lookup(var.workers_group_defaults, "instance_type")), false))}" count = "${length(var.worker_groups)}" lifecycle {