diff --git a/aks/main.tf b/aks/main.tf index 763f9557..ac554dae 100644 --- a/aks/main.tf +++ b/aks/main.tf @@ -32,7 +32,6 @@ module "thanos" { cluster_name = var.cluster_name base_domain = var.base_domain - argocd_namespace = var.argocd_namespace argocd_project = var.argocd_project argocd_labels = var.argocd_labels destination_cluster = var.destination_cluster diff --git a/eks/main.tf b/eks/main.tf index 0ba5dbd8..1d29690d 100644 --- a/eks/main.tf +++ b/eks/main.tf @@ -3,7 +3,6 @@ module "thanos" { cluster_name = var.cluster_name base_domain = var.base_domain - argocd_namespace = var.argocd_namespace argocd_project = var.argocd_project argocd_labels = var.argocd_labels destination_cluster = var.destination_cluster diff --git a/kind/main.tf b/kind/main.tf index 0ba5dbd8..1d29690d 100644 --- a/kind/main.tf +++ b/kind/main.tf @@ -3,7 +3,6 @@ module "thanos" { cluster_name = var.cluster_name base_domain = var.base_domain - argocd_namespace = var.argocd_namespace argocd_project = var.argocd_project argocd_labels = var.argocd_labels destination_cluster = var.destination_cluster diff --git a/main.tf b/main.tf index f71dacd7..42ac8cac 100644 --- a/main.tf +++ b/main.tf @@ -7,10 +7,7 @@ resource "argocd_project" "this" { metadata { name = var.destination_cluster != "in-cluster" ? "thanos-${var.destination_cluster}" : "thanos" - namespace = var.argocd_namespace - annotations = { - "devops-stack.io/argocd_namespace" = var.argocd_namespace - } + namespace = "argocd" } spec { @@ -46,7 +43,7 @@ data "utils_deep_merge_yaml" "values" { resource "argocd_application" "this" { metadata { name = var.destination_cluster != "in-cluster" ? "thanos-${var.destination_cluster}" : "thanos" - namespace = var.argocd_namespace + namespace = "argocd" labels = merge({ "application" = "thanos" "cluster" = var.destination_cluster diff --git a/sks/main.tf b/sks/main.tf index 0ba5dbd8..1d29690d 100644 --- a/sks/main.tf +++ b/sks/main.tf @@ -3,7 +3,6 @@ module "thanos" { cluster_name = var.cluster_name base_domain = var.base_domain - argocd_namespace = var.argocd_namespace argocd_project = var.argocd_project argocd_labels = var.argocd_labels destination_cluster = var.destination_cluster diff --git a/variables.tf b/variables.tf index e1c1ff2e..8bee88a2 100644 --- a/variables.tf +++ b/variables.tf @@ -12,12 +12,6 @@ variable "base_domain" { type = string } -variable "argocd_namespace" { - description = "Namespace used by Argo CD where the Application and AppProject resources should be created." - type = string - default = "argocd" -} - variable "argocd_project" { description = "Name of the Argo CD AppProject where the Application should be created. If not set, the Application will be created in a new AppProject only for this Application." type = string