Add support for the new amazon-eks-node-* AMI (#100)

* add support for the new amazon-eks-node-* AMI

* add CHANGELOG

* remove kubelet_node_labels
This commit is contained in:
Touch Ungboriboonpisal
2018-09-04 03:19:02 -07:00
committed by Max Williams
parent 0736be4553
commit 21f43b8341
5 changed files with 10 additions and 99 deletions

View File

@@ -18,7 +18,7 @@ data "aws_iam_policy_document" "workers_assume_role_policy" {
data "aws_ami" "eks_worker" {
filter {
name = "name"
values = ["eks-worker-*"]
values = ["amazon-eks-node-*"]
}
most_recent = true
@@ -74,13 +74,11 @@ data "template_file" "userdata" {
count = "${var.worker_group_count}"
vars {
region = "${data.aws_region.current.name}"
cluster_name = "${aws_eks_cluster.this.name}"
endpoint = "${aws_eks_cluster.this.endpoint}"
cluster_auth_base64 = "${aws_eks_cluster.this.certificate_authority.0.data}"
max_pod_count = "${lookup(local.max_pod_per_node, lookup(var.worker_groups[count.index], "instance_type", lookup(local.workers_group_defaults, "instance_type")))}"
pre_userdata = "${lookup(var.worker_groups[count.index], "pre_userdata",lookup(local.workers_group_defaults, "pre_userdata"))}"
additional_userdata = "${lookup(var.worker_groups[count.index], "additional_userdata",lookup(local.workers_group_defaults, "additional_userdata"))}"
kubelet_node_labels = "${lookup(var.worker_groups[count.index], "kubelet_node_labels",lookup(local.workers_group_defaults, "kubelet_node_labels"))}"
kubelet_extra_args = "${lookup(var.worker_groups[count.index], "kubelet_extra_args",lookup(local.workers_group_defaults, "kubelet_extra_args"))}"
}
}