Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Change the default launch_template_id to null for Managed Node Groups #1088

Merged
merged 4 commits into from
Nov 7, 2020
Merged

fix: Change the default launch_template_id to null for Managed Node Groups #1088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7861c1b
fix: Change the default launch_emplate_id to null for managed node gr…
Nov 5, 2020
040330d
fix forgontten launch_template_id default
Nov 6, 2020
a90a18a
Merge branch 'master' into tba/fix-1087
barryib Nov 7, 2020
c3b6095
Merge branch 'master' into tba/fix-1087
barryib Nov 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion local.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ locals {
# Settings for launch templates
root_block_device_name = data.aws_ami.eks_worker.root_device_name # Root device name for workers. If non is provided, will assume default AMI was used.
root_kms_key_id = "" # The KMS key to use when encrypting the root storage device
launch_template_id = "" # The id of the launch template used for managed node_groups
launch_template_id = null # The id of the launch template used for managed node_groups
launch_template_version = "$Latest" # The lastest version of the launch template to use in the autoscaling group
launch_template_placement_tenancy = "default" # The placement tenancy for instances
launch_template_placement_group = null # The name of the placement group into which to launch the instances, if any.
Expand Down
4 changes: 2 additions & 2 deletions modules/node_groups/node_groups.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ resource "aws_eks_node_group" "workers" {

ami_type = lookup(each.value, "ami_type", null)
disk_size = lookup(each.value, "disk_size", null)
instance_types = each.value["launch_template_id"] != "" ? [] : [each.value["instance_type"]]
instance_types = each.value["launch_template_id"] != null ? [] : [each.value["instance_type"]]
release_version = lookup(each.value, "ami_release_version", null)

dynamic "remote_access" {
Expand All @@ -31,7 +31,7 @@ resource "aws_eks_node_group" "workers" {
}

dynamic "launch_template" {
for_each = each.value["launch_template_id"] != "" ? [{
for_each = each.value["launch_template_id"] != null ? [{
id = each.value["launch_template_id"]
version = each.value["launch_template_version"]
}] : []
Expand Down