github-mirrors/terraform-aws-eks
1
0
Fork 0
mirror of https://github.com/ysoftdevs/terraform-aws-eks.git synced 2026-03-18 23:43:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

reverting some changes after feedback

Browse Source
This commit is contained in:
Max Williams
2018-07-10 10:15:08 +02:00
parent f881745f00
commit 11cd282ec1
5 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
workers.tf
View File

@@ -1,5 +1,5 @@
resource "aws_autoscaling_group" "workers" {
name_prefix = "${aws_eks_cluster.cluster.name}-${lookup(var.worker_groups[count.index], "name", count.index)}"
name_prefix = "${aws_eks_cluster.this.name}-${lookup(var.worker_groups[count.index], "name", count.index)}"
desired_capacity = "${lookup(var.worker_groups[count.index], "asg_desired_capacity", lookup(var.workers_group_defaults, "asg_desired_capacity"))}"
max_size = "${lookup(var.worker_groups[count.index], "asg_max_size",lookup(var.workers_group_defaults, "asg_max_size"))}"
min_size = "${lookup(var.worker_groups[count.index], "asg_min_size",lookup(var.workers_group_defaults, "asg_min_size"))}"
@@ -9,8 +9,8 @@ resource "aws_autoscaling_group" "workers" {
tags = ["${concat(
list(
map("key", "Name", "value", "${aws_eks_cluster.cluster.name}-${lookup(var.worker_groups[count.index], "name", count.index)}-eks_asg", "propagate_at_launch", true),
map("key", "kubernetes.io/cluster/${aws_eks_cluster.cluster.name}", "value", "owned", "propagate_at_launch", true),
map("key", "Name", "value", "${aws_eks_cluster.this.name}-${lookup(var.worker_groups[count.index], "name", count.index)}-eks_asg", "propagate_at_launch", true),
map("key", "kubernetes.io/cluster/${aws_eks_cluster.this.name}", "value", "owned", "propagate_at_launch", true),
),
local.asg_tags)
}"]
@@ -21,7 +21,7 @@ resource "aws_autoscaling_group" "workers" {
}
resource "aws_launch_configuration" "workers" {
name_prefix = "${aws_eks_cluster.cluster.name}-${lookup(var.worker_groups[count.index], "name", count.index)}"
name_prefix = "${aws_eks_cluster.this.name}-${lookup(var.worker_groups[count.index], "name", count.index)}"
associate_public_ip_address = "${lookup(var.worker_groups[count.index], "public_ip", lookup(var.workers_group_defaults, "public_ip"))}"
security_groups = ["${local.worker_security_group_id}"]
iam_instance_profile = "${aws_iam_instance_profile.workers.id}"
@@ -42,11 +42,11 @@ resource "aws_launch_configuration" "workers" {
}
resource "aws_security_group" "workers" {
name_prefix = "${aws_eks_cluster.cluster.name}"
name_prefix = "${aws_eks_cluster.this.name}"
description = "Security group for all nodes in the cluster."
vpc_id = "${var.vpc_id}"
count = "${var.worker_security_group_id == "" ? 1 : 0}"
tags = "${merge(var.tags, map("Name", "${aws_eks_cluster.cluster.name}-eks_worker_sg", "kubernetes.io/cluster/${aws_eks_cluster.cluster.name}", "owned"
tags = "${merge(var.tags, map("Name", "${aws_eks_cluster.this.name}-eks_worker_sg", "kubernetes.io/cluster/${aws_eks_cluster.this.name}", "owned"
))}"
}
@@ -84,12 +84,12 @@ resource "aws_security_group_rule" "workers_ingress_cluster" {
}
resource "aws_iam_role" "workers" {
name_prefix = "${aws_eks_cluster.cluster.name}"
name_prefix = "${aws_eks_cluster.this.name}"
assume_role_policy = "${data.aws_iam_policy_document.workers_assume_role_policy.json}"
}
resource "aws_iam_instance_profile" "workers" {
name_prefix = "${aws_eks_cluster.cluster.name}"
name_prefix = "${aws_eks_cluster.this.name}"
role = "${aws_iam_role.workers.name}"
}