diff --git a/modules/aws_autoscaling/main.tf b/modules/aws_autoscaling/main.tf index cba193e..b60c7af 100644 --- a/modules/aws_autoscaling/main.tf +++ b/modules/aws_autoscaling/main.tf @@ -68,8 +68,10 @@ module "iam_assumable_role_with_oidc" { role_policy_arns = [aws_iam_policy.worker_autoscaling.arn] oidc_fully_qualified_subjects = ["system:serviceaccount:kube-system:cluster-autoscaler"] - tags = { - Role = "${var.prefix}-cluster-autoscaler" - } - + tags = merge( + { + Role = "${var.prefix}-cluster-autoscaler" + }, + var.tags + ) } diff --git a/modules/aws_ebs_csi/main.tf b/modules/aws_ebs_csi/main.tf index 2e60ece..9eea0ca 100644 --- a/modules/aws_ebs_csi/main.tf +++ b/modules/aws_ebs_csi/main.tf @@ -167,10 +167,12 @@ module "iam_assumable_role_with_oidc" { oidc_fully_qualified_audiences = ["sts.amazonaws.com"] oidc_fully_qualified_subjects = ["system:serviceaccount:kube-system:ebs-csi-controller-sa"] - tags = { - Role = "${var.prefix}-ebs-csi-role" - } - + tags = merge( + { + Role = "${var.prefix}-ebs-csi-role" + }, + var.tags + ) } resource "aws_iam_role_policy_attachment" "ebs_attachment" { diff --git a/modules/aws_vm/main.tf b/modules/aws_vm/main.tf index 457bb62..70ab14c 100644 --- a/modules/aws_vm/main.tf +++ b/modules/aws_vm/main.tf @@ -81,6 +81,12 @@ resource "aws_instance" "vm" { delete_on_termination = var.os_disk_delete_on_termination iops = var.os_disk_iops encrypted = var.enable_ebs_encryption + tags = merge( + { + Name : "${var.name}-root-vol" + }, + var.tags + ) } tags = merge(var.tags, tomap({ Name : "${var.name}-vm" }))