Merge pull request #273 from sassoftware/staging

8.1.1 - February 15, 2024
sassoftware · Feb 15, 2024 · 3e7ab80 · 3e7ab80
2 parents 2340b81 + c5b0afc
commit 3e7ab80
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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" }))