From b5e9083c7291eb9785b5f38d77d7a0d982d21a16 Mon Sep 17 00:00:00 2001 From: "Sean P. Kane" Date: Thu, 14 Jan 2021 15:58:43 -0800 Subject: [PATCH 1/2] improvement: Add nitro enclave support for EKS --- local.tf | 1 + workers_launch_template.tf | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/local.tf b/local.tf index a07aec85fd..c998b24f56 100644 --- a/local.tf +++ b/local.tf @@ -54,6 +54,7 @@ locals { additional_userdata = "" # userdata to append to the default userdata. ebs_optimized = true # sets whether to use ebs optimization on supported types. enable_monitoring = true # Enables/disables detailed monitoring. + enclave_support = false # Enables/disables enclave support public_ip = false # Associate a public ip address with a worker kubelet_extra_args = "" # This string is passed directly to kubelet if set. Useful for adding labels or taints. subnets = var.subnets # A list of subnets to place the worker nodes in. i.e. ["subnet-123", "subnet-456", "subnet-789"] diff --git a/workers_launch_template.tf b/workers_launch_template.tf index d7c4b4156a..f574fcc510 100644 --- a/workers_launch_template.tf +++ b/workers_launch_template.tf @@ -272,6 +272,14 @@ resource "aws_launch_template" "workers_launch_template" { )[count.index] } + enclave_options { + enabled = lookup( + var.worker_groups_launch_template[count.index], + "enclave_support", + local.workers_group_defaults["enclave_support"], + ) + } + image_id = lookup( var.worker_groups_launch_template[count.index], "ami_id", From d1573112ac6976cdc31379a9e7ba0266e309f6f9 Mon Sep 17 00:00:00 2001 From: "Sean P. Kane" Date: Thu, 14 Jan 2021 17:08:41 -0800 Subject: [PATCH 2/2] Update AWS provider version --- README.md | 4 ++-- versions.tf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f46ba5cec8..304559ce95 100644 --- a/README.md +++ b/README.md @@ -145,7 +145,7 @@ MIT Licensed. See [LICENSE](https://github.com/terraform-aws-modules/terraform-a | Name | Version | |------|---------| | terraform | >= 0.12.9, != 0.13.0 | -| aws | >= 3.21.0 | +| aws | >= 3.22.0 | | kubernetes | >= 1.11.1 | | local | >= 1.4 | | null | >= 2.1 | @@ -156,7 +156,7 @@ MIT Licensed. See [LICENSE](https://github.com/terraform-aws-modules/terraform-a | Name | Version | |------|---------| -| aws | >= 3.21.0 | +| aws | >= 3.22.0 | | kubernetes | >= 1.11.1 | | local | >= 1.4 | | null | >= 2.1 | diff --git a/versions.tf b/versions.tf index 2e92c9bed0..a5eb7b6c67 100644 --- a/versions.tf +++ b/versions.tf @@ -2,7 +2,7 @@ terraform { required_version = ">= 0.12.9, != 0.13.0" required_providers { - aws = ">= 3.21.0" + aws = ">= 3.22.0" local = ">= 1.4" null = ">= 2.1" template = ">= 2.1"