add var to tasks

defenseunicorns · Sep 24, 2024 · ea76ef1 · ea76ef1
1 parent 0b7c279
commit ea76ef1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/tasks.yaml b/tasks.yaml
@@ -7,6 +7,14 @@ variables:
     default: ""
   - name: NGINX_EXTRA_PORTS
     default: "[]"
+  - name: COREDNS_OVERRIDES
+    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
+      }
 
 tasks:
   - name: default
@@ -16,7 +24,13 @@ tasks:
         cmd: "uds zarf package create --confirm --no-progress"
 
       - description: "Deploy UDS K3d package"
-        cmd: "uds zarf package deploy zarf-package-uds-k3d-*.tar.zst --confirm --set K3D_IMAGE=${IMAGE_NAME}:${VERSION} --set K3D_EXTRA_ARGS=\"${K3D_EXTRA_ARGS}\" --set NGINX_EXTRA_PORTS=\"${NGINX_EXTRA_PORTS}\" --no-progress"
+        cmd: |
+          uds zarf package deploy zarf-package-uds-k3d-*.tar.zst \
+            --set K3D_IMAGE=${IMAGE_NAME}:${VERSION} \
+            --set K3D_EXTRA_ARGS="${K3D_EXTRA_ARGS}" \
+            --set NGINX_EXTRA_PORTS="${NGINX_EXTRA_PORTS}" \
+            --set COREDNS_OVERRIDES="${COREDNS_OVERRIDES}" \
+            --no-progress --confirm
 
   - name: validate
     actions:

diff --git a/zarf.yaml b/zarf.yaml
@@ -32,8 +32,11 @@ variables:
       "CoreDNS overrides for rewriting requests. Defaults for `*.uds.dev` are the UDS Core Istio tenant and admin gateways."
     autoIndent: true
     default: |
-      rewrite stop {
-        name regex (.*\.uds\.dev) host.k3d.internal answer auto
+      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: