[stable/consul] Pass HttpPort to consul (helm#3375)

* Pass HttpPort to consul

* Bump chart version

* Update chart test to wait for pods to come up.

Author: jonstacks

stable/consul/Chart.yaml

@@ -1,6 +1,6 @@
 name: consul
 home: https://github.com/hashicorp/consul
-version: 1.1.3
+version: 1.1.4
 appVersion: 1.0.0
 description: Highly available and distributed service discovery and key-value store
   designed with support for the modern data center to make distributed systems and

stable/consul/templates/consul.yaml

@@ -263,7 +263,8 @@ spec:
               ${GOSSIP_KEY} \
             {{- end }}
               -client=0.0.0.0 \
-              -dns-port=${DNSPORT}
+              -dns-port=${DNSPORT} \
+              -http-port={{ .Values.HttpPort }}
       volumes:
       - name: gossip-key
         secret:

stable/consul/templates/test-config.yaml

@@ -6,11 +6,19 @@ data:
   run.sh: |-
     @test "Testing Consul cluster has quorum" {
       for i in {0..2}; do
-        if [ `kubectl exec {{ .Release.Name }}-consul-$i consul members --namespace={{ .Release.Namespace }} | grep server | wc -l` -ge "3" ]; then
-          echo "{{ .Release.Name }}-consul-$i OK. consul members returning at least 3 records."
-        else
-          echo "{{ .Release.Name }}-consul-$i ERROR. consul members returning less than 3 records."
-          exit 1
-        fi
+        for n in {1..30}; do
+          if [ `kubectl exec {{ .Release.Name }}-consul-$i consul members --namespace={{ .Release.Namespace }} | grep server | wc -l` -ge "3" ]; then
+            echo "{{ .Release.Name }}-consul-$i OK. consul members returning at least 3 records."
+            break
+          else
+            echo "{{ .Release.Name }}-consul-$i ERROR. consul members returning less than 3 records."
+          fi
+
+          if [ "$n" -ge "30" ]; then
+            echo "Failed $n times to get members from {{ .Release.Name }}-consul-$i"
+            exit 1
+          fi
+          sleep 10
+        done
       done
     }