summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Hussey <sh8121@att.com>2019-01-08 21:26:56 -0600
committerScott Hussey <sh8121@att.com>2019-01-08 21:26:56 -0600
commitc7caae59e43ed58a9d35749161310629d2e830df (patch)
tree3a2d9e7ad02e7ba21fb5208209d81d9dfaca4a8b
parentbb81a1cecd27520b858e00f0bcf519ceb2d07582 (diff)
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
Notes
Notes (review): Code-Review+2: Matt McEuen <matt.mceuen@att.com> Code-Review+2: Bryan Strassner <strassner.bryan@gmail.com> Workflow+1: Bryan Strassner <strassner.bryan@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 09 Jan 2019 14:23:10 +0000 Reviewed-on: https://review.openstack.org/629372 Project: openstack/airship-maas Branch: refs/heads/master
-rw-r--r--charts/maas/templates/bin/_maas-ingress.sh.tpl3
-rw-r--r--charts/maas/templates/configmap-ingress.yaml8
-rw-r--r--charts/maas/templates/service-region.yaml3
3 files changed, 13 insertions, 1 deletions
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 () {
32 --ingress-class=maas-ingress \ 32 --ingress-class=maas-ingress \
33 --default-backend-service=${POD_NAMESPACE}/${ERROR_PAGE_SERVICE} \ 33 --default-backend-service=${POD_NAMESPACE}/${ERROR_PAGE_SERVICE} \
34 --configmap=${POD_NAMESPACE}/maas-ingress-config \ 34 --configmap=${POD_NAMESPACE}/maas-ingress-config \
35 --tcp-services-configmap=${POD_NAMESPACE}/maas-ingress-services-tcp 35 --tcp-services-configmap=${POD_NAMESPACE}/maas-ingress-services-tcp \
36 --udp-services-configmap=${POD_NAMESPACE}/maas-ingress-services-udp
36} 37}
37 38
38function stop () { 39function 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
@@ -28,6 +28,14 @@ data:
28apiVersion: v1 28apiVersion: v1
29kind: ConfigMap 29kind: ConfigMap
30metadata: 30metadata:
31 name: maas-ingress-services-udp
32data:
33 '53': "{{- .Release.Namespace -}}/{{- tuple "maas_region" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" -}}:region-dns"
34...
35---
36apiVersion: v1
37kind: ConfigMap
38metadata:
31 name: maas-ingress-config 39 name: maas-ingress-config
32data: 40data:
33 enable-underscores-in-headers: "true" 41 enable-underscores-in-headers: "true"
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:
34 {{ if .Values.network.region_proxy.node_port.enabled }} 34 {{ if .Values.network.region_proxy.node_port.enabled }}
35 nodePort: {{ tuple "maas_region" "nodeport" "region_proxy" $envAll | include "helm-toolkit.endpoints.endpoint_port_lookup" }} 35 nodePort: {{ tuple "maas_region" "nodeport" "region_proxy" $envAll | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
36 {{ end }} 36 {{ end }}
37 - name: region-dns
38 port: 53
39 targetPort: 53
37 selector: 40 selector:
38{{ tuple $envAll "maas" "region" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} 41{{ tuple $envAll "maas" "region" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
39 {{ if or .Values.network.region_proxy.node_port.enabled .Values.network.region_api.node_port.enabled }} 42 {{ if or .Values.network.region_proxy.node_port.enabled .Values.network.region_api.node_port.enabled }}