From a3f850f601e68a02989709b84cfb52acc54f7bc4 Mon Sep 17 00:00:00 2001 From: tom Date: Thu, 25 Aug 2022 14:52:36 +0800 Subject: [PATCH] add variable to support extra aws resource tag for asg --- modules/aws/kube-worker/main.tf | 6 +++--- modules/aws/kube-worker/variables.tf | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/aws/kube-worker/main.tf b/modules/aws/kube-worker/main.tf index cd09684..c858a77 100644 --- a/modules/aws/kube-worker/main.tf +++ b/modules/aws/kube-worker/main.tf @@ -1,8 +1,6 @@ locals { vpc_id = data.aws_subnet.subnet.vpc_id - asg_extra_tags = [for k, v in var.extra_tags : { key = k, value = v, propagate_at_launch = true } if k != "Name"] - iops_by_type = { root = { "gp3" : max(3000, var.instance_config["root_volume_iops"]), @@ -95,7 +93,9 @@ resource "aws_autoscaling_group" "worker" { } dynamic "tag" { - for_each = merge(var.extra_tags, + for_each = merge( + var.extra_tags, + var.extra_asg_tags, { "Name" = "${var.name}-worker-${var.instance_config["name"]}" "Role" = "k8s-worker" diff --git a/modules/aws/kube-worker/variables.tf b/modules/aws/kube-worker/variables.tf index f95debf..965078f 100644 --- a/modules/aws/kube-worker/variables.tf +++ b/modules/aws/kube-worker/variables.tf @@ -229,6 +229,12 @@ variable "extra_tags" { default = {} } +variable "extra_asg_tags" { + description = "Extra AWS tags to be applied to K8s worker group auto scaling group." + type = map(string) + default = {} +} + variable "enable_extra_sg" { description = "Enable extra security group for worker group." type = bool