From 4b3a02695c9514a940e6ded9d9ef11ccd99d02bc Mon Sep 17 00:00:00 2001
From: Brandon J <bjacobs@coreweave.com>
Date: Tue, 27 Sep 2022 12:53:38 -0600
Subject: [PATCH] fix(dns): Fix override capability for ingress (#13)

* fix(dns): Allow fullnameoverride in Ingress
---
 charts/argo-cd/Chart.yaml             | 2 +-
 charts/argo-cd/templates/_helpers.tpl | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index ea11ea12..b9b084fe 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v2.3.1
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 4.7.3
+version: 4.7.4
 home: https://github.com/coreweave/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 keywords:
diff --git a/charts/argo-cd/templates/_helpers.tpl b/charts/argo-cd/templates/_helpers.tpl
index f9068a7e..206af2e3 100644
--- a/charts/argo-cd/templates/_helpers.tpl
+++ b/charts/argo-cd/templates/_helpers.tpl
@@ -279,7 +279,11 @@ Create the name of the configmap to use
     Create Hostname helper -- Coreweave Use Only
 */}}
 {{- define "coreweave.externalDnsName" -}}
-{{ default (printf "argocd.%s.ord1.ingress.coreweave.cloud" .Release.Namespace) .Values.customExternalDnsName }}
+{{- if .Values.fullnameOverride -}}
+{{ default (printf "%s.%s.%s.ingress.coreweave.cloud" .Values.fullnameOverride .Release.Namespace (.Values.region | lower | toString)) .Values.customExternalDnsName }}
+{{- else -}}
+{{ default (printf "%s.%s.%s.ingress.coreweave.cloud" .Release.Name .Release.Namespace (.Values.region | lower | toString)) .Values.customExternalDnsName }}
+{{- end -}}
 {{- end -}}
 
 {{/*