From c7caae59e43ed58a9d35749161310629d2e830df Mon Sep 17 00:00:00 2001
From: Scott Hussey <sh8121@att.com>
Date: Tue, 8 Jan 2019 21:26:56 -0600
Subject: [PATCH] Forward DNS via ingress

- Forward UDP DNS requests from maas-ingress to the region pod
  for PXE networks that do not have access to upstream DNS servers.

Change-Id: Icf88bac4c0df1a351a5bd246e3fa8bf28135d37e
---
 charts/maas/templates/bin/_maas-ingress.sh.tpl | 3 ++-
 charts/maas/templates/configmap-ingress.yaml   | 8 ++++++++
 charts/maas/templates/service-region.yaml      | 3 +++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/charts/maas/templates/bin/_maas-ingress.sh.tpl b/charts/maas/templates/bin/_maas-ingress.sh.tpl
index f8e47b2..b9d3a2d 100644
--- a/charts/maas/templates/bin/_maas-ingress.sh.tpl
+++ b/charts/maas/templates/bin/_maas-ingress.sh.tpl
@@ -32,7 +32,8 @@ function start () {
       --ingress-class=maas-ingress \
       --default-backend-service=${POD_NAMESPACE}/${ERROR_PAGE_SERVICE} \
       --configmap=${POD_NAMESPACE}/maas-ingress-config \
-      --tcp-services-configmap=${POD_NAMESPACE}/maas-ingress-services-tcp
+      --tcp-services-configmap=${POD_NAMESPACE}/maas-ingress-services-tcp \
+      --udp-services-configmap=${POD_NAMESPACE}/maas-ingress-services-udp
 }
 
 function stop () {
diff --git a/charts/maas/templates/configmap-ingress.yaml b/charts/maas/templates/configmap-ingress.yaml
index d959075..e07b9c9 100644
--- a/charts/maas/templates/configmap-ingress.yaml
+++ b/charts/maas/templates/configmap-ingress.yaml
@@ -27,6 +27,14 @@ data:
 ---
 apiVersion: v1
 kind: ConfigMap
+metadata:
+  name: maas-ingress-services-udp
+data:
+  '53': "{{- .Release.Namespace -}}/{{- tuple "maas_region" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" -}}:region-dns"
+...
+---
+apiVersion: v1
+kind: ConfigMap
 metadata:
   name: maas-ingress-config
 data:
diff --git a/charts/maas/templates/service-region.yaml b/charts/maas/templates/service-region.yaml
index 06241ec..6361935 100644
--- a/charts/maas/templates/service-region.yaml
+++ b/charts/maas/templates/service-region.yaml
@@ -34,6 +34,9 @@ spec:
       {{ if .Values.network.region_proxy.node_port.enabled }}
       nodePort:  {{ tuple "maas_region" "nodeport" "region_proxy" $envAll | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
       {{ end }}
+    - name: region-dns
+      port: 53
+      targetPort: 53
   selector:
 {{ tuple $envAll "maas" "region" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   {{ if or .Values.network.region_proxy.node_port.enabled .Values.network.region_api.node_port.enabled }}