From 170e4a9d7f82402bf273c90552d52da562c06af5 Mon Sep 17 00:00:00 2001 From: Vargha Csongor Date: Fri, 15 Mar 2024 12:12:38 +0100 Subject: [PATCH] enable kustomize helm, add argocd domain --- oci-managed/argocd/argocd.tf | 21 +++++++++++++++------ oci-managed/argocd/output.tf | 4 ++++ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/oci-managed/argocd/argocd.tf b/oci-managed/argocd/argocd.tf index c55d072..5032ae9 100644 --- a/oci-managed/argocd/argocd.tf +++ b/oci-managed/argocd/argocd.tf @@ -14,15 +14,24 @@ resource "helm_release" "argocd" { name = "configs.params.server\\.insecure" value = "true" } + set { + name = "configs.cm.kustomize\\.buildOptions" + value = "--enable-helm" + } + set { + name = "global.domain" + value = "argocd.${var.my_domain}" + } } resource "kubectl_manifest" "dashboard-ingress" { depends_on = [helm_release.argocd] - + + force_new = true server_side_apply = true - yaml_body = templatefile("${path.module}/argocd_ingress_route.tfpl.yaml", { - namespace = var.namespace, - my_domain = var.my_domain - }) -} \ No newline at end of file + yaml_body = templatefile("${path.module}/argocd_ingress_route.tfpl.yaml", { + namespace = var.namespace, + my_domain = var.my_domain + }) +} diff --git a/oci-managed/argocd/output.tf b/oci-managed/argocd/output.tf index 78c9283..36213f7 100644 --- a/oci-managed/argocd/output.tf +++ b/oci-managed/argocd/output.tf @@ -5,3 +5,7 @@ output "argocd_url" { output "argo_helm_values_overrides" { value = helm_release.argocd.metadata[0].values } + +output "argocd_ingress_route" { + value = kubectl_manifest.dashboard-ingress.yaml_body_parsed +} \ No newline at end of file