commit 03706e6924e0aa1f131ddfe784f6173b558c73fd
author David Bainbridge <dbainbri@ciena.com> Fri Oct 18 17:59:24 2019 +0000
committer David Bainbridge <dbainbri@ciena.com> Sat Oct 19 23:53:53 2019 +0000
tree 12049dd58432455eaa5197079cf25240b75d0184
parent 95fa34dba16ef3222488a27253d2ef0b5df6216b

VOL-2110 - update how default image tags are managed

- Sneak in a work around for helm 2.15

Change-Id: Iabe4fa98b5b4a574061f1fac7a876b3f1f05c398

voltha-adapter-simulated/values.yaml

diff --git a/voltha-adapter-simulated/values.yaml b/voltha-adapter-simulated/values.yaml
index 6098a7d..62d524b 100644
--- a/voltha-adapter-simulated/values.yaml
+++ b/voltha-adapter-simulated/values.yaml
@@ -46,11 +46,11 @@
   adapter_simulated_olt:
     registry: '{{ .Values.defaults.image_registry }}'
     repository: '{{ .Values.defaults.image_org }}voltha-adapter-simulated-olt'
-    tag: '{{ if hasKey .Values.defaults "image_tag" }}{{ .Values.defaults.image_tag }}{{ else }}2.2.0{{ end }}'
+    tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}2.2.0{{- end }}{{- else }}2.2.0{{- end }}'
     pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
 
   adapter_simulated_onu:
     registry: '{{ .Values.defaults.image_registry }}'
     repository: '{{ .Values.defaults.image_org }}voltha-adapter-simulated-onu'
-    tag: '{{ if hasKey .Values.defaults "image_tag" }}{{ .Values.defaults.image_tag }}{{ else }}2.2.0{{ end }}'
+    tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}2.2.0{{- end }}{{- else }}2.2.0{{- end }}'
     pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'