VOL-1702 - revert back to how tag was set without embedded tpl
Change-Id: I5b430032aceb928fb93c8898aa181ef56e0510cc
diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index 8846411..bfec00c 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -17,5 +17,5 @@
description: A Helm chart for Voltha based on K8S resources in Voltha project
icon: https://guide.opencord.org/logos/cord.svg
-version: 2.0.4
+version: 2.0.5
appVersion: 2.0.0
diff --git a/voltha/values.yaml b/voltha/values.yaml
index 5c8c9a7..dc7930b 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -20,7 +20,7 @@
# Default overrides
defaults:
image_registry: ""
- image_tag: '{{ .Chart.AppVersion }}'
+ image_tag:
image_org: "voltha/"
image_pullPolicy: "Always"
rw_core:
@@ -84,36 +84,36 @@
cli:
registry: '{{ .Values.defaults.image_registry }}'
repository: '{{ .Values.defaults.image_org }}voltha-cli'
- tag: '{{ .Values.defaults.image_tag }}'
+ tag: '{{ .Values.defaults.image_tag | default .Chart.AppVersion }}'
pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
ofagent:
registry: '{{ .Values.defaults.image_registry }}'
repository: '{{ .Values.defaults.image_org }}voltha-ofagent'
- tag: '{{ .Values.defaults.image_tag }}'
+ tag: '{{ .Values.defaults.image_tag | default .Chart.AppVersion }}'
pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
ro_core:
registry: '{{ .Values.defaults.image_registry }}'
repository: '{{ .Values.defaults.image_org }}voltha-ro-core'
- tag: '{{ .Values.defaults.image_tag }}'
+ tag: '{{ .Values.defaults.image_tag | default .Chart.AppVersion }}'
pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
rw_core:
registry: '{{ .Values.defaults.image_registry }}'
repository: '{{ .Values.defaults.image_org }}voltha-rw-core'
- tag: '{{ .Values.defaults.image_tag }}'
+ tag: '{{ .Values.defaults.image_tag | default .Chart.AppVersion }}'
pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
afrouter:
registry: '{{ .Values.defaults.image_registry }}'
repository: '{{ .Values.defaults.image_org }}voltha-afrouter'
- tag: '{{ .Values.defaults.image_tag }}'
+ tag: '{{ .Values.defaults.image_tag | default .Chart.AppVersion }}'
pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
afrouterd:
registry: '{{ .Values.defaults.image_registry }}'
repository: '{{ .Values.defaults.image_org }}voltha-afrouterd'
- tag: '{{ .Values.defaults.image_tag }}'
+ tag: '{{ .Values.defaults.image_tag | default .Chart.AppVersion }}'
pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
restartPolicy: 'Always'