From 20b9ea5d7da5fe1c6cadded3f35096397986eb14 Mon Sep 17 00:00:00 2001 From: Relk Date: Mon, 29 Nov 2021 16:19:09 +0800 Subject: [PATCH] fix: create duplicate worker role when var.role_name is set --- modules/aws/kube-worker/outputs.tf | 2 +- modules/aws/kube-worker/role.tf | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/aws/kube-worker/outputs.tf b/modules/aws/kube-worker/outputs.tf index b4e8b4a9..1ceec3ed 100644 --- a/modules/aws/kube-worker/outputs.tf +++ b/modules/aws/kube-worker/outputs.tf @@ -7,7 +7,7 @@ output "worker_launch_template_name" { } output "worker_role_name" { - value = aws_iam_role.worker.name + value = length(aws_iam_role.worker[*].name) > 0 ? aws_iam_role.worker[0].name : var.role_name } output "worker_instance_profile_name" { diff --git a/modules/aws/kube-worker/role.tf b/modules/aws/kube-worker/role.tf index 7d9c197d..02028069 100644 --- a/modules/aws/kube-worker/role.tf +++ b/modules/aws/kube-worker/role.tf @@ -14,7 +14,8 @@ data "aws_iam_policy_document" "worker_profile" { } resource "aws_iam_role" "worker" { - name_prefix = "${var.name}-worker-" + count = var.role_name == "" ? 1 : 0 + name_prefix = "${var.name}-worker-${var.instance_config["name"]}-" assume_role_policy = data.aws_iam_policy_document.worker_profile.json } @@ -115,11 +116,11 @@ resource "aws_iam_policy" "worker_vpc_cni" { resource "aws_iam_role_policy_attachment" "worker" { count = var.role_name == "" ? 1 : 0 policy_arn = aws_iam_policy.worker[0].arn - role = aws_iam_role.worker.name + role = var.role_name == "" ? aws_iam_role.worker[0].name : var.role_name } resource "aws_iam_role_policy_attachment" "worker_vpc_cni" { count = var.network_plugin == "amazon-vpc" ? 1 : 0 policy_arn = aws_iam_policy.worker_vpc_cni[0].arn - role = aws_iam_role.worker.name + role = var.role_name == "" ? aws_iam_role.worker[0].name : var.role_name }