From fa22c5b76149d0858c66aaa36bc62d126712209e Mon Sep 17 00:00:00 2001 From: Stevie <4719798+transient1@users.noreply.github.com> Date: Tue, 30 May 2023 16:58:58 -0400 Subject: [PATCH] remove classiclink params from module and examples (#75) --- modules/single-cluster/variables.tf | 4 ---- modules/single-cluster/vpc.tf | 1 - tests/fixtures/terraform.1az.tfvars.example.output | 2 -- tests/fixtures/terraform.nat-gw.tfvars.example.output | 2 -- tests/fixtures/terraform.s3ep.tfvars.example.output | 2 -- variables.tf | 6 +----- vpc.tf | 1 - 7 files changed, 1 insertion(+), 17 deletions(-) diff --git a/modules/single-cluster/variables.tf b/modules/single-cluster/variables.tf index e296984..a1ba08e 100644 --- a/modules/single-cluster/variables.tf +++ b/modules/single-cluster/variables.tf @@ -47,10 +47,6 @@ variable "vpc_enable_dns_hostnames" { default = "true" } -variable "vpc_enable_classiclink" { - default = "false" -} - ## Tagging Settings variable "extra_tags_global" { type = map(string) diff --git a/modules/single-cluster/vpc.tf b/modules/single-cluster/vpc.tf index 5735b95..72b386b 100644 --- a/modules/single-cluster/vpc.tf +++ b/modules/single-cluster/vpc.tf @@ -4,7 +4,6 @@ resource "aws_vpc" "kube_vpc" { instance_tenancy = var.vpc_instance_tenancy enable_dns_support = var.vpc_enable_dns_support enable_dns_hostnames = var.vpc_enable_dns_hostnames - enable_classiclink = var.vpc_enable_classiclink tags = merge( local.tags, { diff --git a/tests/fixtures/terraform.1az.tfvars.example.output b/tests/fixtures/terraform.1az.tfvars.example.output index c096960..90b7f34 100644 --- a/tests/fixtures/terraform.1az.tfvars.example.output +++ b/tests/fixtures/terraform.1az.tfvars.example.output @@ -195,8 +195,6 @@ Terraform will perform the following actions: default_route_table_id: default_security_group_id: dhcp_options_id: - enable_classiclink: "false" - enable_classiclink_dns_support: enable_dns_hostnames: "true" enable_dns_support: "true" instance_tenancy: "default" diff --git a/tests/fixtures/terraform.nat-gw.tfvars.example.output b/tests/fixtures/terraform.nat-gw.tfvars.example.output index 9c4251d..92be495 100644 --- a/tests/fixtures/terraform.nat-gw.tfvars.example.output +++ b/tests/fixtures/terraform.nat-gw.tfvars.example.output @@ -477,8 +477,6 @@ Terraform will perform the following actions: default_route_table_id: default_security_group_id: dhcp_options_id: - enable_classiclink: "false" - enable_classiclink_dns_support: enable_dns_hostnames: "true" enable_dns_support: "true" instance_tenancy: "default" diff --git a/tests/fixtures/terraform.s3ep.tfvars.example.output b/tests/fixtures/terraform.s3ep.tfvars.example.output index 7614d03..4cf6e13 100644 --- a/tests/fixtures/terraform.s3ep.tfvars.example.output +++ b/tests/fixtures/terraform.s3ep.tfvars.example.output @@ -477,8 +477,6 @@ Terraform will perform the following actions: default_route_table_id: default_security_group_id: dhcp_options_id: - enable_classiclink: "false" - enable_classiclink_dns_support: enable_dns_hostnames: "true" enable_dns_support: "true" instance_tenancy: "default" diff --git a/variables.tf b/variables.tf index dfd01bb..ef18f15 100644 --- a/variables.tf +++ b/variables.tf @@ -45,10 +45,6 @@ variable "vpc_enable_dns_hostnames" { default = "true" } -variable "vpc_enable_classiclink" { - default = "false" -} - variable "admin_subnet_parent_cidr" { description = "parent CIDR for the administrative subnets" default = ".0.0/19" @@ -149,7 +145,7 @@ variable "s3_vpc_endpoint_policy" { default = <