From 9ef4efc5c48fd1d623184de7e7aeb298d5d58cc3 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Tue, 11 Sep 2018 19:09:45 -0700
Subject: [PATCH] client and server must export both TCP and UDP DNS ports

---
 templates/client-daemonset.yaml   | 6 +++++-
 templates/dns-service.yaml        | 4 ++--
 templates/server-service.yaml     | 9 +++++++--
 templates/server-statefulset.yaml | 6 +++++-
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/templates/client-daemonset.yaml b/templates/client-daemonset.yaml
index 23b9897..10a332c 100644
--- a/templates/client-daemonset.yaml
+++ b/templates/client-daemonset.yaml
@@ -119,7 +119,11 @@ spec:
             - containerPort: 8300
               name: server
             - containerPort: 8600
-              name: dns
+              name: dns-tcp
+              protocol: "TCP"
+            - containerPort: 8600
+              name: dns-udp
+              protocol: "UDP"
           readinessProbe:
             # NOTE(mitchellh): when our HTTP status endpoints support the
             # proper status codes, we should switch to that. This is temporary.
diff --git a/templates/dns-service.yaml b/templates/dns-service.yaml
index 8f0d30f..40846fb 100644
--- a/templates/dns-service.yaml
+++ b/templates/dns-service.yaml
@@ -14,11 +14,11 @@ spec:
     - name: dns-tcp
       port: 53
       protocol: "TCP"
-      targetPort: dns
+      targetPort: dns-tcp
     - name: dns-udp
       port: 53
       protocol: "UDP"
-      targetPort: dns
+      targetPort: dns-udp
   selector:
     app: {{ template "consul.name" . }}
     release: "{{ .Release.Name }}"
diff --git a/templates/server-service.yaml b/templates/server-service.yaml
index ef3b40b..902abe0 100644
--- a/templates/server-service.yaml
+++ b/templates/server-service.yaml
@@ -46,9 +46,14 @@ spec:
     - name: server
       port: 8300
       targetPort: 8300
-    - name: dns
+    - name: dns-tcp
+      protocol: "TCP"
       port: 8600
-      targetPort: 8600
+      targetPort: dns-tcp
+    - name: dns-udp
+      protocol: "UDP"
+      port: 8600
+      targetPort: dns-udp
   selector:
     app: {{ template "consul.name" . }}
     release: "{{ .Release.Name }}"
diff --git a/templates/server-statefulset.yaml b/templates/server-statefulset.yaml
index 7276782..09ad457 100644
--- a/templates/server-statefulset.yaml
+++ b/templates/server-statefulset.yaml
@@ -131,7 +131,11 @@ spec:
             - containerPort: 8300
               name: server
             - containerPort: 8600
-              name: dns
+              name: dns-tcp
+              protocol: "TCP"
+            - containerPort: 8600
+              name: dns-udp
+              protocol: "UDP"
           readinessProbe:
             # NOTE(mitchellh): when our HTTP status endpoints support the
             # proper status codes, we should switch to that. This is temporary.