VOL-1797 - fix helm lint issues
Change-Id: I74ccff1f7f431e05fc3963d0707382f478a010f0
diff --git a/voltha-adapter-openonu/Chart.yaml b/voltha-adapter-openonu/Chart.yaml
index 558d5a4..d372a21 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.0.1
+version: 2.0.2
appVersion: 2.0.0
diff --git a/voltha-adapter-openonu/templates/adapters-openolt.yaml b/voltha-adapter-openonu/templates/adapters-openolt.yaml
index d4afdc7..9447d90 100644
--- a/voltha-adapter-openonu/templates/adapters-openolt.yaml
+++ b/voltha-adapter-openonu/templates/adapters-openolt.yaml
@@ -37,7 +37,7 @@
spec:
containers:
- name: adapter-open-onu
- image: {{ tpl .Values.images.adapter_open_onu.registry . }}{{ tpl .Values.images.adapter_open_onu.repository . }}:{{ tpl .Values.images.adapter_open_onu.tag . }}
+ image: {{ tpl .Values.images.adapter_open_onu.registry . }}{{ tpl .Values.images.adapter_open_onu.repository . }}:{{ tpl ( tpl .Values.images.adapter_open_onu.tag . ) . }}
imagePullPolicy: {{ tpl .Values.images.adapter_open_onu.pullPolicy . }}
args:
- "/voltha/adapters/brcm_openomci_onu/main.py"
diff --git a/voltha-adapter-openonu/values.yaml b/voltha-adapter-openonu/values.yaml
index 234f580..3070a8a 100644
--- a/voltha-adapter-openonu/values.yaml
+++ b/voltha-adapter-openonu/values.yaml
@@ -15,10 +15,10 @@
---
# Default overrides
defaults:
- image_registry:
- image_tag:
- image_org:
- image_pullPolicy:
+ image_registry: ""
+ image_tag: '{{ .Chart.AppVersion }}'
+ image_org: "voltha/"
+ image_pullPolicy: "Always"
# Define connectivity to required services
services:
@@ -41,7 +41,7 @@
images:
adapter_open_onu:
- registry: '{{ .Values.defaults.image_registry | default "" }}'
- repository: '{{ .Values.defaults.image_org | default "voltha/" }}voltha-openonu-adapter'
- tag: '{{ .Values.defaults.image_tag | default .Chart.AppVersion }}'
- pullPolicy: '{{ .Values.defaults.image_pullPolicy | default "Always" }}'
+ registry: '{{ .Values.defaults.image_registry }}'
+ repository: '{{ .Values.defaults.image_org }}voltha-openonu-adapter'
+ tag: '{{ .Values.defaults.image_tag }}'
+ pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'