From d6bf67f2aa5f309266b3ef700235df4fa2ad0280 Mon Sep 17 00:00:00 2001
From: Nathan Valentine <nrvale0@users.noreply.github.com>
Date: Mon, 17 Jul 2017 16:57:57 -0700
Subject: [PATCH] fix Consul DNS port parameter handling (#1312)

* fix Consul DNS port parameter handling

* Update Chart.yaml
---
 stable/consul/Chart.yaml            |  2 +-
 stable/consul/templates/consul.yaml | 23 ++++++++++++++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/stable/consul/Chart.yaml b/stable/consul/Chart.yaml
index c3f592da8c..5721518717 100755
--- a/stable/consul/Chart.yaml
+++ b/stable/consul/Chart.yaml
@@ -1,6 +1,6 @@
 name: consul
 home: https://github.com/hashicorp/consul
-version: 0.3.0
+version: 0.3.1
 appVersion: 0.8.3
 description: Highly available and distributed service discovery and key-value store designed with support for the modern data center to make distributed systems and configuration easy.
 icon: https://raw.githubusercontent.com/hashicorp/consul/bce3809dfca37b883828c3715b84143dd71c0f85/website/source/assets/images/favicons/android-chrome-512x512.png
diff --git a/stable/consul/templates/consul.yaml b/stable/consul/templates/consul.yaml
index 450e1841f6..5040660c77 100644
--- a/stable/consul/templates/consul.yaml
+++ b/stable/consul/templates/consul.yaml
@@ -55,9 +55,12 @@ spec:
     protocol: "UDP"
     port: {{ .Values.SerfwanUdpPort }}
   - name: server
-    port: {{ .Values.ServerPort }}
-  - name: consuldns
-    port: {{ .Values.ConsulDnsPort }}
+    port: {{.Values.ServerPort}}
+  - name: consuldns-tcp
+    port: {{.Values.ConsulDnsPort}}
+  - name: consuldns-udp
+    protocol: "UDP"
+    port: {{.Values.ConsulDnsPort}}
   clusterIP: None
   selector:
     component: "{{ .Release.Name }}-{{ .Values.Component }}"
@@ -109,9 +112,12 @@ spec:
           protocol: "UDP"
           containerPort: {{ .Values.SerfwanUdpPort }}
         - name: server
-          containerPort: {{ .Values.ServerPort }}
-        - name: consuldns
-          containerPort: {{ .Values.ConsulDnsPort }}
+          containerPort: {{.Values.ServerPort}}
+        - name: consuldns-tcp
+          containerPort: {{.Values.ConsulDnsPort}}
+        - name: consuldns-udp
+          protocol: "UDP"
+          containerPort: {{.Values.ConsulDnsPort}}
         resources:
           requests:
             cpu: "{{ .Values.Cpu }}"
@@ -129,6 +135,8 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
+        - name: DNSPORT
+          value: "{{ .Values.ConsulDnsPort }}"
         volumeMounts:
         - name: datadir
           mountPath: /var/lib/consul
@@ -183,7 +191,8 @@ spec:
               -advertise=${IP} \
               ${PEERS} \
               ${GOSSIP_KEY} \
-              -client=0.0.0.0
+              -client=0.0.0.0 \
+              -dns-port=${DNSPORT}
       volumes:
       - name: gossip-key
         secret: