Merge pull request #875 from dexhorthy/etnmts

finish fixing consul integration test
replicatedhq · Mar 20, 2019 · 835c04d · 835c04d
2 parents 7b77fb2 + 2a3b32f
commit 835c04d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/integration/base/shipapp-helm-values/expected/installer/base/consul-statefulset.yaml b/integration/base/shipapp-helm-values/expected/installer/base/consul-statefulset.yaml
@@ -15,7 +15,7 @@ spec:
   template:
     metadata:
       labels:
-        chart: consul-3.6.0
+        chart: consul-3.5.3
         component: ship-consul
         heritage: Tiller
         release: ship

diff --git a/integration/base/shipapp-helm-values/expected/installer/consul-rendered.yaml b/integration/base/shipapp-helm-values/expected/installer/consul-rendered.yaml
@@ -93,7 +93,7 @@ spec:
   template:
     metadata:
       labels:
-        chart: consul-3.6.0
+        chart: consul-3.5.3
         component: ship-consul
         heritage: Tiller
         release: ship

diff --git a/integration/base/shipapp-helm-values/expected/installer/consul/Chart.yaml b/integration/base/shipapp-helm-values/expected/installer/consul/Chart.yaml
@@ -1,6 +1,6 @@
 name: consul
 home: https://github.com/hashicorp/consul
-version: 3.6.0
+version: 3.5.3
 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

diff --git a/...tion/base/shipapp-helm-values/expected/installer/consul/templates/consul-statefulset.yaml b/...tion/base/shipapp-helm-values/expected/installer/consul/templates/consul-statefulset.yaml
@@ -139,7 +139,7 @@ spec:
             {{- range .Values.ConsulConfig }}
               -config-dir /etc/consul/userconfig/{{ .name }} \
             {{- end}}
-            {{- if .Values.ui.enabled }}
+            {{- if .Values.uiService.enabled }}
               -ui \
             {{- end }}
             {{- if .Values.DisableHostNodeId }}