🐛 (Argocd Apps): Fix maps instead of lists, and pin argocd-apps to la…

…test 1.x See argoproj/argo-helm@237493a
openfun · Oct 16, 2024 · c326f47 · c326f47
1 parent 9cdcffb
commit c326f47
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 27 deletions.
diff --git a/common/argocd-apps-values.yaml.tftpl b/common/argocd-apps-values.yaml.tftpl
@@ -1,6 +1,7 @@
 ---
 applicationsets:
-  - name: apps
+  # See https://github.com/argoproj/argo-helm/commit/237493a4ab1478a0c33cb1253767f65ce4ec007c
+  %{ if tonumber(split(".", argocd_apps_version).0) < 2 }- name: apps%{ else }apps:%{ endif }
     namespace: argocd
     generators:
       - git:

diff --git a/common/argocd.tf b/common/argocd.tf
@@ -33,10 +33,13 @@ resource "helm_release" "argocd-apps" {
   repository = "https://argoproj.github.io/argo-helm"
   chart      = "argocd-apps"
 
+  version    = var.argocd_apps_version
+
   values = [
     templatefile("${path.module}/argocd-apps-values.yaml.tftpl",
       {
         repo_url = var.argocd_repo_url
+        argocd_apps_version = var.argocd_apps_version
       }
     )
   ]

diff --git a/common/variables.tf b/common/variables.tf
@@ -29,6 +29,12 @@ variable "argocd_version" {
   default     = "5.33.1"
 }
 
+variable "argocd_apps_version" {
+  type        = string
+  description = "ArgoCD apps version"
+  default     = "1.6.2"
+}
+
 variable "argocd_avp_version" {
   type        = string
   description = "ArgoCD argo-vault-plugin version"

diff --git a/standalone/.terraform.lock.hcl b/standalone/.terraform.lock.hcl