diff --git a/infra/_modules/bootstrap/argocd.tf b/infra/_modules/bootstrap/argocd.tf index 0bb7eb7..5d2b946 100644 --- a/infra/_modules/bootstrap/argocd.tf +++ b/infra/_modules/bootstrap/argocd.tf @@ -4,7 +4,7 @@ resource "helm_release" "argocd" { create_namespace = true repository = "https://argoproj.github.io/argo-helm" chart = "argo-cd" - version = "8.1.3" + version = "8.3.0" timeout = 60 * 10 max_history = 1 # Revert with Terraform instead @@ -12,11 +12,6 @@ resource "helm_release" "argocd" { yamlencode({ global = { domain = "argocd.${var.cluster_domain}" - image = { - # TODO override to use the latest development version for first class OCI support - # Remove once ArgoCD 3.1.0 stable is released - tag = "v3.1.0-rc1" - } } configs = { params = { @@ -40,8 +35,7 @@ resource "helm_release" "argocd" { } rbac = { - # TODO remove k3d-specific logic? - "policy.default" = var.platform == "k3d" ? "role:admin" : "role:readonly" + "policy.default" = "role:readonly" } } server = { @@ -51,13 +45,9 @@ resource "helm_release" "argocd" { annotations = { "cert-manager.io/cluster-issuer" = "letsencrypt-prod" } - tls = !(var.platform == "k3d") + tls = true } } - repoServer = { - hostNetwork = var.platform == "k3d" - dnsPolicy = var.platform == "k3d" ? "ClusterFirstWithHostNet" : "ClusterFirst" - } dex = { enabled = false }