diff --git a/modules/terraform/aws/eks/addon/variables.tf b/modules/terraform/aws/eks/addon/variables.tf index 4cc468272..254015d4c 100644 --- a/modules/terraform/aws/eks/addon/variables.tf +++ b/modules/terraform/aws/eks/addon/variables.tf @@ -8,12 +8,6 @@ variable "cluster_oidc_provider_url" { type = string } -variable "tags" { - description = "A map of tags to add to all resources" - type = map(string) - default = {} -} - variable "eks_addon_config_map" { description = "A map of EKS addons to deploy" type = map(object({ diff --git a/modules/terraform/aws/karpenter/variables.tf b/modules/terraform/aws/karpenter/variables.tf index cffc61721..274ff7bb8 100644 --- a/modules/terraform/aws/karpenter/variables.tf +++ b/modules/terraform/aws/karpenter/variables.tf @@ -23,27 +23,3 @@ variable "json_input" { region = string }) } - -variable "owner" { - description = "Owner of the scenario" - type = string - default = "azure_devops" -} - -variable "scenario_name" { - description = "Name of the scenario" - type = string - default = "" -} - -variable "scenario_type" { - description = "value of the scenario type" - type = string - default = "" -} - -variable "deletion_delay" { - description = "Time duration after which the resources can be deleted (e.g., '1h', '2h', '4h')" - type = string - default = "2h" -} diff --git a/modules/terraform/aws/main.tf b/modules/terraform/aws/main.tf index 51e9c6c31..f3ad5ef3d 100644 --- a/modules/terraform/aws/main.tf +++ b/modules/terraform/aws/main.tf @@ -1,7 +1,7 @@ locals { region = lookup(var.json_input, "region", "us-east-1") run_id = lookup(var.json_input, "run_id", "123456") - current_time = lookup(var.json_input, "current_time") + current_time = var.json_input["current_time"] non_computed_tags = { # Note: Define only non computed values (i.e. values that do not change for each resource). This is required due to a limitation at "aws" provider default_tags. @@ -45,7 +45,6 @@ module "virtual_network" { source = "./virtual-network" network_config = each.value region = local.region - tags = local.tags } module "eks" { diff --git a/modules/terraform/aws/virtual-network/variables.tf b/modules/terraform/aws/virtual-network/variables.tf index 2fec0e784..0379e5cdb 100644 --- a/modules/terraform/aws/virtual-network/variables.tf +++ b/modules/terraform/aws/virtual-network/variables.tf @@ -50,8 +50,3 @@ variable "region" { type = string } -variable "tags" { - type = map(string) - default = { - } -}