Updated tag handling.

SCT-Engineering · Sep 14, 2023 · 7bcfb0f · 7bcfb0f
1 parent 5c76420
commit 7bcfb0f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/main.tf b/main.tf
@@ -18,13 +18,13 @@ data "kubernetes_namespace" "existing-ns" {
 }
 
 locals {
-  base_tags = {
+  tags = merge({
     "eks-cluster-name"      = var.cluster_name
     "boc:tf_module_name"    = local._module_name
     "boc:tf_module_version" = local._module_version
     "boc:created_by"        = "terraform"
     CostAllocation          = var.tag_costallocation
-  }
+  }, var.additional_tags)
 
   ns = try(kubernetes_namespace.ns[0].metadata[0].name, data.kubernetes_namespace.existing-ns[0].metadata[0].name)
 }
@@ -52,7 +52,7 @@ module "loki-irsa-role" {
       namespace_service_accounts = ["${var.namespace}:loki"]
     }
   }
-  tags = merge(local.base_tags, var.additional_tags)
+  tags = local.tags
 }
 
 resource "helm_release" "loki" {

diff --git a/s3.tf b/s3.tf
@@ -15,7 +15,5 @@ module "loki-s3" {
   bucket_name       = format("%v-loki", var.cluster_name)
   access_log_bucket = data.aws_s3_bucket.s3_server_access_logs.id
 
-  tags = {
-    "eks-cluster-name" = var.cluster_name
-  }
+  tags = local.tags
 }
diff --git a/variables.tf b/variables.tf
@@ -1,6 +1,7 @@
 variable "tag_costallocation" {
   description = "Tag CostAllocation (default)"
   type        = string
+  default     = "csvd:infrastructure"
 }
 
 variable "additional_tags" {