feat: add variables to set AppProject and destination cluster

camptocamp · Oct 19, 2023 · 43632fc · 43632fc
1 parent c0ade6d
commit 43632fc
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 26 deletions.
diff --git a/aks/main.tf b/aks/main.tf
@@ -41,11 +41,13 @@ resource "azurerm_federated_identity_credential" "loki" {
 module "loki-stack" {
   source = "../"
 
-  argocd_namespace = var.argocd_namespace
-  target_revision  = var.target_revision
-  namespace        = var.namespace
-  app_autosync     = var.app_autosync
-  dependency_ids   = var.dependency_ids
+  argocd_namespace    = var.argocd_namespace
+  argocd_project      = var.argocd_project
+  destination_cluster = var.destination_cluster
+  target_revision     = var.target_revision
+  namespace           = var.namespace
+  app_autosync        = var.app_autosync
+  dependency_ids      = var.dependency_ids
 
   retention       = var.retention
   ingress         = var.ingress

diff --git a/eks/main.tf b/eks/main.tf
@@ -1,11 +1,13 @@
 module "loki-stack" {
   source = "../"
 
-  argocd_namespace = var.argocd_namespace
-  target_revision  = var.target_revision
-  namespace        = var.namespace
-  app_autosync     = var.app_autosync
-  dependency_ids   = var.dependency_ids
+  argocd_namespace    = var.argocd_namespace
+  argocd_project      = var.argocd_project
+  destination_cluster = var.destination_cluster
+  target_revision     = var.target_revision
+  namespace           = var.namespace
+  app_autosync        = var.app_autosync
+  dependency_ids      = var.dependency_ids
 
   retention       = var.retention
   ingress         = var.ingress

diff --git a/kind/main.tf b/kind/main.tf
@@ -1,11 +1,13 @@
 module "loki-stack" {
   source = "../"
 
-  argocd_namespace = var.argocd_namespace
-  target_revision  = var.target_revision
-  namespace        = var.namespace
-  app_autosync     = var.app_autosync
-  dependency_ids   = var.dependency_ids
+  argocd_namespace    = var.argocd_namespace
+  argocd_project      = var.argocd_project
+  destination_cluster = var.destination_cluster
+  target_revision     = var.target_revision
+  namespace           = var.namespace
+  app_autosync        = var.app_autosync
+  dependency_ids      = var.dependency_ids
 
   retention       = var.retention
   ingress         = var.ingress

diff --git a/main.tf b/main.tf
@@ -13,20 +13,22 @@ resource "htpasswd_password" "loki_password_hash" {
 }
 
 resource "argocd_project" "this" {
+  count = var.argocd_project == null ? 1 : 0
+
   metadata {
-    name      = "loki-stack"
+    name      = var.destination_cluster != "in-cluster" ? "loki-stack-${var.destination_cluster}" : "loki-stack"
     namespace = var.argocd_namespace
     annotations = {
       "devops-stack.io/argocd_namespace" = var.argocd_namespace
     }
   }
 
   spec {
-    description  = "Loki application project"
+    description  = "Loki application project for cluster ${var.destination_cluster}"
     source_repos = ["https://github.com/camptocamp/devops-stack-module-loki-stack.git"]
 
     destination {
-      name      = "in-cluster"
+      name      = var.destination_cluster
       namespace = var.namespace
     }
 
@@ -47,7 +49,7 @@ data "utils_deep_merge_yaml" "values" {
 
 resource "argocd_application" "this" {
   metadata {
-    name      = "loki-stack"
+    name      = var.destination_cluster != "in-cluster" ? "loki-stack-${var.destination_cluster}" : "loki-stack"
     namespace = var.argocd_namespace
   }
 
@@ -59,7 +61,7 @@ resource "argocd_application" "this" {
   wait = var.app_autosync == { "allow_empty" = tobool(null), "prune" = tobool(null), "self_heal" = tobool(null) } ? false : true
 
   spec {
-    project = argocd_project.this.metadata.0.name
+    project = var.argocd_project == null ? argocd_project.this[0].metadata.0.name : var.argocd_project
 
     source {
       repo_url        = "https://github.com/camptocamp/devops-stack-module-loki-stack.git"
@@ -71,7 +73,7 @@ resource "argocd_application" "this" {
     }
 
     destination {
-      name      = "in-cluster"
+      name      = var.destination_cluster
       namespace = var.namespace
     }
 

diff --git a/sks/main.tf b/sks/main.tf
@@ -1,11 +1,13 @@
 module "loki-stack" {
   source = "../"
 
-  argocd_namespace = var.argocd_namespace
-  target_revision  = var.target_revision
-  namespace        = var.namespace
-  app_autosync     = var.app_autosync
-  dependency_ids   = var.dependency_ids
+  argocd_namespace    = var.argocd_namespace
+  argocd_project      = var.argocd_project
+  destination_cluster = var.destination_cluster
+  target_revision     = var.target_revision
+  namespace           = var.namespace
+  app_autosync        = var.app_autosync
+  dependency_ids      = var.dependency_ids
 
   retention       = var.retention
   ingress         = var.ingress

diff --git a/variables.tf b/variables.tf
@@ -8,6 +8,18 @@ variable "argocd_namespace" {
   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
+  default     = null
+}
+
+variable "destination_cluster" {
+  description = "Destination cluster where the application should be deployed."
+  type        = string
+  default     = "in-cluster"
+}
+
 variable "target_revision" {
   description = "Override of target revision of the application chart."
   type        = string