Skip to content

Commit fd0edd1

Browse files
authored
Merge pull request #268 from kbst/fixdnsdefaults
Revert configurable VPC DNS settings to previous default
2 parents f136ebe + a67d4e2 commit fd0edd1

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

aws/_modules/eks/variables.tf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,11 @@ variable "vpc_control_subnet_newbits" {
3737
variable "vpc_dns_hostnames" {
3838
description = "Enable DNS hostnames in the VPC."
3939
type = bool
40-
default = false
4140
}
4241

4342
variable "vpc_dns_support" {
4443
description = "Enable DNS support in the VPC."
4544
type = bool
46-
default = false
4745
}
4846

4947
variable "vpc_node_subnet_newbits" {

aws/cluster/configuration.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ locals {
2020
cluster_vpc_subnet_newbits = lookup(local.cfg, "cluster_vpc_subnet_newbits", "8") # kept for backward compatibility
2121
cluster_vpc_control_subnet_newbits = lookup(local.cfg, "cluster_vpc_control_subnet_newbits", local.cluster_vpc_subnet_newbits)
2222
cluster_vpc_dns_hostnames = lookup(local.cfg, "cluster_vpc_dns_hostnames", false)
23-
cluster_vpc_dns_support = lookup(local.cfg, "cluster_vpc_dns_support", false)
23+
cluster_vpc_dns_support = lookup(local.cfg, "cluster_vpc_dns_support", true)
2424
cluster_vpc_node_subnet_newbits = lookup(local.cfg, "cluster_vpc_node_subnet_newbits", "4")
2525
cluster_vpc_node_subnet_number_offset = lookup(local.cfg, "cluster_vpc_node_subnet_number_offset", "1")
2626
cluster_vpc_legacy_node_subnets = lookup(local.cfg, "cluster_vpc_legacy_node_subnets", false)
@@ -32,7 +32,7 @@ locals {
3232

3333
cluster_additional_node_tags_lookup = lookup(local.cfg, "cluster_additional_node_tags", "")
3434
cluster_additional_node_tags_tuples = [for t in split(",", local.cluster_additional_node_tags_lookup) : split("=", t)]
35-
cluster_additional_node_tags = {for t in local.cluster_additional_node_tags_tuples : t[0] => t[1] if length(t) == 2}
35+
cluster_additional_node_tags = { for t in local.cluster_additional_node_tags_tuples : t[0] => t[1] if length(t) == 2 }
3636

3737
cluster_desired_capacity = local.cfg["cluster_desired_capacity"]
3838

0 commit comments

Comments
 (0)