From 0269d38fcae2b1ca566427159d33910fe96299a7 Mon Sep 17 00:00:00 2001 From: Bryant Biggs Date: Fri, 25 Mar 2022 04:26:16 -0400 Subject: [PATCH] feat: Update TLS provider and remove unnecessary cloud init version requirements (#1966) --- README.md | 4 ++-- examples/eks_managed_node_group/main.tf | 9 +++++---- modules/eks-managed-node-group/README.md | 1 - modules/eks-managed-node-group/versions.tf | 4 ---- modules/self-managed-node-group/README.md | 1 - modules/self-managed-node-group/versions.tf | 4 ---- versions.tf | 2 +- 7 files changed, 8 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index c27a829883..1a3409a27c 100644 --- a/README.md +++ b/README.md @@ -807,14 +807,14 @@ Full contributing [guidelines are covered here](https://github.com/terraform-aws |------|---------| | [terraform](#requirement\_terraform) | >= 0.13.1 | | [aws](#requirement\_aws) | >= 3.72 | -| [tls](#requirement\_tls) | >= 2.2 | +| [tls](#requirement\_tls) | >= 3.0 | ## Providers | Name | Version | |------|---------| | [aws](#provider\_aws) | >= 3.72 | -| [tls](#provider\_tls) | >= 2.2 | +| [tls](#provider\_tls) | >= 3.0 | ## Modules diff --git a/examples/eks_managed_node_group/main.tf b/examples/eks_managed_node_group/main.tf index 639a56f827..225c5140d0 100644 --- a/examples/eks_managed_node_group/main.tf +++ b/examples/eks_managed_node_group/main.tf @@ -568,10 +568,11 @@ resource "aws_launch_template" "external" { enabled = true } - network_interfaces { - associate_public_ip_address = false - delete_on_termination = true - } + # Disabling due to https://github.com/hashicorp/terraform-provider-aws/issues/23766 + # network_interfaces { + # associate_public_ip_address = false + # delete_on_termination = true + # } # if you want to use a custom AMI # image_id = var.ami_id diff --git a/modules/eks-managed-node-group/README.md b/modules/eks-managed-node-group/README.md index a89c5f9df0..6c02fe5974 100644 --- a/modules/eks-managed-node-group/README.md +++ b/modules/eks-managed-node-group/README.md @@ -50,7 +50,6 @@ module "eks_managed_node_group" { |------|---------| | [terraform](#requirement\_terraform) | >= 0.13.1 | | [aws](#requirement\_aws) | >= 3.72 | -| [cloudinit](#requirement\_cloudinit) | >= 2.0 | ## Providers diff --git a/modules/eks-managed-node-group/versions.tf b/modules/eks-managed-node-group/versions.tf index e196e178e4..22e8d7265f 100644 --- a/modules/eks-managed-node-group/versions.tf +++ b/modules/eks-managed-node-group/versions.tf @@ -6,9 +6,5 @@ terraform { source = "hashicorp/aws" version = ">= 3.72" } - cloudinit = { - source = "hashicorp/cloudinit" - version = ">= 2.0" - } } } diff --git a/modules/self-managed-node-group/README.md b/modules/self-managed-node-group/README.md index d42a46ac76..128b8348a2 100644 --- a/modules/self-managed-node-group/README.md +++ b/modules/self-managed-node-group/README.md @@ -41,7 +41,6 @@ module "self_managed_node_group" { |------|---------| | [terraform](#requirement\_terraform) | >= 0.13.1 | | [aws](#requirement\_aws) | >= 3.72 | -| [cloudinit](#requirement\_cloudinit) | >= 2.0 | ## Providers diff --git a/modules/self-managed-node-group/versions.tf b/modules/self-managed-node-group/versions.tf index e196e178e4..22e8d7265f 100644 --- a/modules/self-managed-node-group/versions.tf +++ b/modules/self-managed-node-group/versions.tf @@ -6,9 +6,5 @@ terraform { source = "hashicorp/aws" version = ">= 3.72" } - cloudinit = { - source = "hashicorp/cloudinit" - version = ">= 2.0" - } } } diff --git a/versions.tf b/versions.tf index cb7e557e9d..85e4ed7915 100644 --- a/versions.tf +++ b/versions.tf @@ -8,7 +8,7 @@ terraform { } tls = { source = "hashicorp/tls" - version = ">= 2.2" + version = ">= 3.0" } } }