From 686ff43a1f77a80f0a0f1855236a2f694074d158 Mon Sep 17 00:00:00 2001
From: Justin Law <justin.law@defenseunicorns.com>
Date: Fri, 27 Sep 2024 13:48:39 -0400
Subject: [PATCH] working zarf helm overrides

---
 chart/templates/core-dns-custom.yaml | 10 +---------
 chart/values.yaml                    | 11 +++++++++++
 zarf.yaml                            |  5 +++++
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/chart/templates/core-dns-custom.yaml b/chart/templates/core-dns-custom.yaml
index efc30d9..a169eae 100644
--- a/chart/templates/core-dns-custom.yaml
+++ b/chart/templates/core-dns-custom.yaml
@@ -5,12 +5,4 @@ metadata:
   namespace: kube-system
 data:
   uds.override: |
-    rewrite stop {
-      name regex (.*\.admin\.uds\.dev) admin-ingressgateway.istio-admin-gateway.svc.cluster.local answer auto
-    }
-    rewrite stop {
-      name regex (.*\.uds\.dev) tenant-ingressgateway.istio-tenant-gateway.svc.cluster.local answer auto
-    }
-    rewrite stop {
-      name regex (.*\.uds\.dev) host.k3d.internal answer auto
-    }
\ No newline at end of file
+{{ .Values.coreDnsOverrides | indent 4 }}
\ No newline at end of file
diff --git a/chart/values.yaml b/chart/values.yaml
index a14ebd6..fa13b07 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -1 +1,12 @@
 extraPorts: []
+
+coreDnsOverrides: |
+  rewrite stop {
+    name regex (.*\.admin\.uds\.dev) admin-ingressgateway.istio-admin-gateway.svc.cluster.local answer auto
+  }
+  rewrite stop {
+    name regex (.*\.uds\.dev) tenant-ingressgateway.istio-tenant-gateway.svc.cluster.local answer auto
+  }
+  rewrite stop {
+    name regex (.*\.uds\.dev) host.k3d.internal answer auto
+  }
\ No newline at end of file
diff --git a/zarf.yaml b/zarf.yaml
index 0295680..9a9d19f 100644
--- a/zarf.yaml
+++ b/zarf.yaml
@@ -93,6 +93,11 @@ components:
         # x-release-please-end
         valuesFiles:
           - "values/dev-stack-values.yaml"
+        variables:
+          - name: COREDNS_OVERRIDES
+            # Defaults contain rewrites of `*.uds.dev` to the UDS core Istio tenant and admin gateways
+            description: "CoreDNS overrides"
+            path: coreDnsOverrides
       - name: minio
         namespace: uds-dev-stack
         version: 5.2.0