From 0840a69782ddee7be5496f76e23dc6ea6412524d Mon Sep 17 00:00:00 2001
From: Justin Law <justin.law@defenseunicorns.com>
Date: Fri, 27 Sep 2024 10:29:28 -0400
Subject: [PATCH] Zarf helm overrides

---
 chart/templates/core-dns-custom.yaml |  1 -
 chart/values.yaml                    |  4 +---
 values/dev-stack-values.yaml         |  3 ---
 zarf.yaml                            | 17 +++++------------
 4 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/chart/templates/core-dns-custom.yaml b/chart/templates/core-dns-custom.yaml
index 1f70b69..07c34d2 100644
--- a/chart/templates/core-dns-custom.yaml
+++ b/chart/templates/core-dns-custom.yaml
@@ -5,5 +5,4 @@ metadata:
   namespace: kube-system
 data:
   uds.override: |
-{{ .Values.coreDnsDefaults | nindent 4 }}
 {{ .Values.coreDnsOverrides | nindent 4 }}
\ No newline at end of file
diff --git a/chart/values.yaml b/chart/values.yaml
index e64249b..3b13fd4 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -1,11 +1,9 @@
 extraPorts: []
 
-coreDnsDefaults: |
+coreDnsOverrides: |
   rewrite {
     name regex (.*\.admin\.uds\.dev) admin-ingressgateway.istio-admin-gateway.svc.cluster.local answer auto
   }
   rewrite {
     name regex (.*\.uds\.dev) tenant-ingressgateway.istio-tenant-gateway.svc.cluster.local answer auto
   }
-
-coreDnsOverrides: ""
\ No newline at end of file
diff --git a/values/dev-stack-values.yaml b/values/dev-stack-values.yaml
index cf35b87..a67e584 100644
--- a/values/dev-stack-values.yaml
+++ b/values/dev-stack-values.yaml
@@ -1,4 +1 @@
 extraPorts: ###ZARF_VAR_NGINX_EXTRA_PORTS###
-
-coreDnsDefaults: |
-  ###ZARF_VAR_COREDNS_DEFAULTS###
\ No newline at end of file
diff --git a/zarf.yaml b/zarf.yaml
index 3a1b0d2..13d61e6 100644
--- a/zarf.yaml
+++ b/zarf.yaml
@@ -27,18 +27,6 @@ variables:
     description: "Optionally allow more ports through Nginx (combine with K3D_EXTRA_ARGS '-p <port>:<port>@server:*')"
     default: "[]"
 
-  - name: COREDNS_DEFAULTS
-    description: |
-      "Default CoreDNS rewrites that resolve `*.uds.dev` requests to the UDS Core Istio tenant and admin gateways."
-    autoIndent: true
-    default: |
-      rewrite {
-        name regex (.*admin\.uds\.dev) admin-ingressgateway.istio-admin-gateway.svc.cluster.local answer auto
-      }
-      rewrite {
-        name regex (.*\.uds\.dev) tenant-ingressgateway.istio-tenant-gateway.svc.cluster.local answer auto
-      }
-
 components:
   - name: destroy-cluster
     required: true
@@ -103,6 +91,11 @@ components:
         version: 0.2.0
         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