Make adapter charts handle tags consistently with other voltha charts
Change-Id: I2d7b99a1545430e06600927eb665ab0a46cb89bd
diff --git a/voltha-adapter-openolt/Chart.yaml b/voltha-adapter-openolt/Chart.yaml
index fcffeeb..8ab93ea 100644
--- a/voltha-adapter-openolt/Chart.yaml
+++ b/voltha-adapter-openolt/Chart.yaml
@@ -17,5 +17,5 @@
description: A Helm chart for Voltha OpenOLT Adapter
icon: https://guide.opencord.org/logos/cord.svg
-version: 2.1.5
+version: 2.1.6
appVersion: 2.2.1
diff --git a/voltha-adapter-openolt/values.yaml b/voltha-adapter-openolt/values.yaml
index 660e18d..a6bed81 100644
--- a/voltha-adapter-openolt/values.yaml
+++ b/voltha-adapter-openolt/values.yaml
@@ -16,7 +16,7 @@
# Default overrides
defaults:
image_registry: ""
- image_tag: '{{ .Chart.AppVersion }}'
+ image_tag: ~
image_org: "voltha/"
image_pullPolicy: "Always"
@@ -43,5 +43,5 @@
adapter_open_olt:
registry: '{{ .Values.defaults.image_registry }}'
repository: '{{ .Values.defaults.image_org }}voltha-openolt-adapter'
- tag: '{{ .Values.defaults.image_tag }}'
+ tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}{{ .Chart.AppVersion }}{{- end }}{{- else }}{{ .Chart.AppVersion }}{{- end }}'
pullPolicy: '{{ .Values.defaults.image_pullPolicy | default "Always" }}'
diff --git a/voltha-adapter-openonu/Chart.yaml b/voltha-adapter-openonu/Chart.yaml
index 8946bdc..6652cc6 100644
--- a/voltha-adapter-openonu/Chart.yaml
+++ b/voltha-adapter-openonu/Chart.yaml
@@ -17,5 +17,5 @@
description: A Helm chart for Voltha OpenONU Adapter
icon: https://guide.opencord.org/logos/cord.svg
-version: 2.1.4
+version: 2.1.5
appVersion: 2.2.1
diff --git a/voltha-adapter-openonu/values.yaml b/voltha-adapter-openonu/values.yaml
index 3070a8a..4c2459f 100644
--- a/voltha-adapter-openonu/values.yaml
+++ b/voltha-adapter-openonu/values.yaml
@@ -16,7 +16,7 @@
# Default overrides
defaults:
image_registry: ""
- image_tag: '{{ .Chart.AppVersion }}'
+ image_tag: ~
image_org: "voltha/"
image_pullPolicy: "Always"
@@ -43,5 +43,5 @@
adapter_open_onu:
registry: '{{ .Values.defaults.image_registry }}'
repository: '{{ .Values.defaults.image_org }}voltha-openonu-adapter'
- tag: '{{ .Values.defaults.image_tag }}'
+ tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}{{ .Chart.AppVersion }}{{- end }}{{- else }}{{ .Chart.AppVersion }}{{- end }}'
pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'