diff --git a/argocd/argocd/Chart.yaml b/argocd/argocd/Chart.yaml index 8fc43d6717..6cc4cb8c5f 100644 --- a/argocd/argocd/Chart.yaml +++ b/argocd/argocd/Chart.yaml @@ -12,11 +12,11 @@ description: | * ArgoCD Notifications dependencies: - name: "argo-cd" - version: "3.13.2" + version: "3.17.3" repository: "https://argoproj.github.io/argo-helm" - name: "argocd-applicationset" - version: "1.3.0" + version: "1.3.1" repository: "https://argoproj.github.io/argo-helm" - name: "argocd-notifications" - version: "1.4.3" + version: "1.4.4" repository: "https://argoproj.github.io/argo-helm" diff --git a/modules/argocd-helm/variables.tf b/modules/argocd-helm/variables.tf index f8979746ba..d234955f15 100644 --- a/modules/argocd-helm/variables.tf +++ b/modules/argocd-helm/variables.tf @@ -150,6 +150,6 @@ variable "wait_for_app_of_apps" { variable "repositories" { description = "A list of repositories to add to ArgoCD." - type = map(string) + type = map(map(string)) default = {} } diff --git a/modules/values.tmpl.yaml b/modules/values.tmpl.yaml index e2139669c1..fdaa02716c 100644 --- a/modules/values.tmpl.yaml +++ b/modules/values.tmpl.yaml @@ -58,11 +58,8 @@ argo-cd: installCRDs: false configs: %{ if length(repositories) > 0 } - repositoryCredentials: - %{ for k, v in repositories } - ${replace(k, "/[^-._a-zA-Z0-9]/", "_")}: | - ${indent(8, v)} - %{ endfor } + repositories: + ${indent(6, yamlencode(repositories))} %{ endif } secret: argocdServerAdminPassword: "$2a$10$wzUzrdx.jMb7lHIbW6VutuRpV4OnpPA3ItWBDiP04QVHfGqzAoj6i" # argocd @@ -83,15 +80,6 @@ argo-cd: server: config: accounts.pipeline: apiKey - %{ if length(repositories) > 0 } - repositories: | - %{ for k, v in repositories } - - url: ${k} - sshPrivateKeySecret: - name: argocd-repository-credentials - key: ${replace(k, "/[^-._a-zA-Z0-9]/", "_")} - %{ endfor } - %{ endif } resource.customizations: | argoproj.io/Application: health.lua: | diff --git a/modules/variables.tf b/modules/variables.tf index 20839fc853..7a2b7516b8 100644 --- a/modules/variables.tf +++ b/modules/variables.tf @@ -67,6 +67,6 @@ variable "grafana_admin_password" { variable "repositories" { description = "A list of repositories to add to ArgoCD." - type = map(string) + type = map(map(string)) default = {} }