Skip to content

Commit 7032a96

Browse files
bryantbiggsbryantbiggs
committed
chore: Stash changes from testing
1 parent dd94630 commit 7032a96

File tree

10 files changed

+20
-32
lines changed

10 files changed

+20
-32
lines changed

‎docs/compute_resources.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@ Refer to the [EKS Managed Node Group documentation](https://docs.aws.amazon.com/
7373
kubelet:
7474
config:
7575
shutdownGracePeriod: 30s
76-
featureGates:
77-
DisableKubeletCloudCredentialProviders: true
7876
EOT
7977
content_type = "application/node.eks.aws"
8078
}]

‎examples/eks-managed-node-group/eks-al2023.tf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ module "eks_al2023" {
4242
kubelet:
4343
config:
4444
shutdownGracePeriod: 30s
45-
featureGates:
46-
DisableKubeletCloudCredentialProviders: true
4745
EOT
4846
}
4947
]

‎examples/self-managed-node-group/eks-al2023.tf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ module "eks_al2023" {
4141
kubelet:
4242
config:
4343
shutdownGracePeriod: 30s
44-
featureGates:
45-
DisableKubeletCloudCredentialProviders: true
4644
EOT
4745
}
4846
]

‎modules/eks-managed-node-group/main.tf

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -305,17 +305,17 @@ resource "aws_launch_template" "this" {
305305
}
306306

307307
dynamic "placement" {
308-
for_each = length(var.placement) > 0 || local.create_placement_group ? [var.placement] : []
308+
for_each = var.placement != null || local.create_placement_group ? [var.placement] : []
309309

310310
content {
311-
affinity = placement.value.affinity
312-
availability_zone = placement.value.availability_zone
311+
affinity = try(placement.value.affinity, null)
312+
availability_zone = try(placement.value.availability_zone, null)
313313
group_name = try(coalesce(aws_placement_group.this[0].name, placement.value.group_name), null)
314-
host_id = placement.value.host_id
315-
host_resource_group_arn = placement.value.host_resource_group_arn
316-
partition_number = placement.value.partition_number
317-
spread_domain = placement.value.spread_domain
318-
tenancy = placement.value.tenancy
314+
host_id = try(placement.value.host_id, null)
315+
host_resource_group_arn = try(placement.value.host_resource_group_arn, null)
316+
partition_number = try(placement.value.partition_number, null)
317+
spread_domain = try(placement.value.spread_domain, null)
318+
tenancy = try(placement.value.tenancy, null)
319319
}
320320
}
321321

‎modules/eks-managed-node-group/variables.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ variable "placement" {
391391
spread_domain = optional(string)
392392
tenancy = optional(string)
393393
})
394-
default = {}
394+
default = null
395395
}
396396

397397
variable "create_placement_group" {
@@ -436,7 +436,7 @@ variable "subnet_ids" {
436436
variable "min_size" {
437437
description = "Minimum number of instances/nodes"
438438
type = number
439-
default = 0
439+
default = 1
440440
}
441441

442442
variable "max_size" {

‎modules/self-managed-node-group/variables.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ variable "placement" {
326326
spread_domain = optional(string)
327327
tenancy = optional(string)
328328
})
329-
default = {}
329+
default = null
330330
}
331331

332332
variable "create_placement_group" {
@@ -548,7 +548,7 @@ variable "subnet_ids" {
548548
variable "min_size" {
549549
description = "The minimum size of the autoscaling group"
550550
type = number
551-
default = 0
551+
default = 1
552552
}
553553

554554
variable "max_size" {

‎node_groups.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -319,12 +319,12 @@ module "eks_managed_node_group" {
319319
create_launch_template = try(each.value.create_launch_template, null)
320320
use_custom_launch_template = try(each.value.use_custom_launch_template, null)
321321
launch_template_id = try(each.value.launch_template_id, null)
322-
launch_template_name = try(each.value.launch_template_name, each.key)
322+
launch_template_name = coalesce(each.value.launch_template_name, each.key)
323323
launch_template_use_name_prefix = try(each.value.launch_template_use_name_prefix, null)
324324
launch_template_version = try(each.value.launch_template_version, null)
325325
launch_template_default_version = try(each.value.launch_template_default_version, null)
326326
update_launch_template_default_version = try(each.value.update_launch_template_default_version, null)
327-
launch_template_description = try(each.value.launch_template_description, "Custom launch template for ${try(each.value.name, each.key)} EKS managed node group")
327+
launch_template_description = coalesce(each.value.launch_template_description, "Custom launch template for ${coalesce(each.value.name, each.key)} EKS managed node group")
328328
launch_template_tags = try(each.value.launch_template_tags, null)
329329
tag_specifications = try(each.value.tag_specifications, null)
330330

@@ -461,12 +461,12 @@ module "self_managed_node_group" {
461461
# Launch Template
462462
create_launch_template = try(each.value.create_launch_template, null)
463463
launch_template_id = try(each.value.launch_template_id, null)
464-
launch_template_name = try(each.value.launch_template_name, each.key)
464+
launch_template_name = coalesce(each.value.launch_template_name, each.key)
465465
launch_template_use_name_prefix = try(each.value.launch_template_use_name_prefix, null)
466466
launch_template_version = try(each.value.launch_template_version, null)
467467
launch_template_default_version = try(each.value.launch_template_default_version, null)
468468
update_launch_template_default_version = try(each.value.update_launch_template_default_version, null)
469-
launch_template_description = try(each.value.launch_template_description, "Custom launch template for ${try(each.value.name, each.key)} self managed node group")
469+
launch_template_description = coalesce(each.value.launch_template_description, "Custom launch template for ${coalesce(each.value.name, each.key)} self managed node group")
470470
launch_template_tags = try(each.value.launch_template_tags, null)
471471
tag_specifications = try(each.value.tag_specifications, null)
472472

‎tests/eks-managed-node-group/main.tf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,6 @@ module "eks" {
126126
kubelet:
127127
config:
128128
shutdownGracePeriod: 30s
129-
featureGates:
130-
DisableKubeletCloudCredentialProviders: true
131129
EOT
132130
}
133131
]
@@ -229,8 +227,6 @@ module "eks" {
229227
kubelet:
230228
config:
231229
shutdownGracePeriod: 30s
232-
featureGates:
233-
DisableKubeletCloudCredentialProviders: true
234230
EOT
235231
content_type = "application/node.eks.aws"
236232
}]

‎tests/self-managed-node-group/main.tf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,6 @@ module "eks" {
228228
kubelet:
229229
config:
230230
shutdownGracePeriod: 30s
231-
featureGates:
232-
DisableKubeletCloudCredentialProviders: true
233231
EOT
234232
content_type = "application/node.eks.aws"
235233
}]

‎variables.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,7 @@ variable "self_managed_node_groups" {
789789
use_name_prefix = optional(bool, true)
790790
availability_zones = optional(list(string))
791791
subnet_ids = optional(list(string))
792-
min_size = optional(number, 0)
792+
min_size = optional(number, 1)
793793
max_size = optional(number, 3)
794794
desired_size = optional(number, 1)
795795
desired_size_type = optional(string)
@@ -1118,7 +1118,7 @@ variable "self_managed_node_groups" {
11181118
partition_number = optional(number)
11191119
spread_domain = optional(string)
11201120
tenancy = optional(string)
1121-
}), {})
1121+
}))
11221122
maintenance_options = optional(object({
11231123
auto_recovery = optional(string)
11241124
}))
@@ -1216,7 +1216,7 @@ variable "eks_managed_node_groups" {
12161216
name = optional(string) # Will fall back to map key
12171217
use_name_prefix = optional(bool, true)
12181218
subnet_ids = optional(list(string))
1219-
min_size = optional(number, 0)
1219+
min_size = optional(number, 1)
12201220
max_size = optional(number, 3)
12211221
desired_size = optional(number, 1)
12221222
ami_id = optional(string, "")
@@ -1357,7 +1357,7 @@ variable "eks_managed_node_groups" {
13571357
partition_number = optional(number)
13581358
spread_domain = optional(string)
13591359
tenancy = optional(string)
1360-
}), {})
1360+
}))
13611361
network_interfaces = optional(list(object({
13621362
associate_carrier_ip_address = optional(bool)
13631363
associate_public_ip_address = optional(bool)

0 commit comments

Comments
 (0)