From dfd5a8f808e200aca3265551ad51250aece25aaf Mon Sep 17 00:00:00 2001 From: leonsodhi-lf <42376753+leonsodhi-lf@users.noreply.github.com> Date: Wed, 30 Jan 2019 10:42:31 +0000 Subject: [PATCH] Use launch template defaults for launch template userdata (#255) * User launch template defaults for launch template userdata * Updated changelog --- CHANGELOG.md | 1 + data.tf | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80dd548..13f462d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ project adheres to [Semantic Versioning](http://semver.org/). ##### Changed - Change worker group ASG to use create_before_destroy (by @stefansedich) +- Fixed a bug where worker group defaults were being used for launch template user data (by @leonsodhi-lf) # History diff --git a/data.tf b/data.tf index d4b5106..c28e692 100644 --- a/data.tf +++ b/data.tf @@ -91,8 +91,8 @@ data "template_file" "launch_template_userdata" { cluster_name = "${aws_eks_cluster.this.name}" endpoint = "${aws_eks_cluster.this.endpoint}" cluster_auth_base64 = "${aws_eks_cluster.this.certificate_authority.0.data}" - pre_userdata = "${lookup(var.worker_groups_launch_template[count.index], "pre_userdata", local.workers_group_defaults["pre_userdata"])}" - additional_userdata = "${lookup(var.worker_groups_launch_template[count.index], "additional_userdata", local.workers_group_defaults["additional_userdata"])}" - kubelet_extra_args = "${lookup(var.worker_groups_launch_template[count.index], "kubelet_extra_args", local.workers_group_defaults["kubelet_extra_args"])}" + pre_userdata = "${lookup(var.worker_groups_launch_template[count.index], "pre_userdata", local.workers_group_launch_template_defaults["pre_userdata"])}" + additional_userdata = "${lookup(var.worker_groups_launch_template[count.index], "additional_userdata", local.workers_group_launch_template_defaults["additional_userdata"])}" + kubelet_extra_args = "${lookup(var.worker_groups_launch_template[count.index], "kubelet_extra_args", local.workers_group_launch_template_defaults["kubelet_extra_args"])}" } }