VOL-1797 - fix helm lint issues
Change-Id: I74ccff1f7f431e05fc3963d0707382f478a010f0
diff --git a/voltha-adapter-simulated/Chart.yaml b/voltha-adapter-simulated/Chart.yaml
index 2c20864..760d9dd 100644
--- a/voltha-adapter-simulated/Chart.yaml
+++ b/voltha-adapter-simulated/Chart.yaml
@@ -17,5 +17,5 @@
description: A Helm chart for Voltha Simulated Adaptyer based on K8S resources in Voltha project
icon: https://guide.opencord.org/logos/cord.svg
-version: 2.0.2
+version: 2.0.3
appVersion: 2.0.0
diff --git a/voltha-adapter-simulated/templates/adapters-simulated.yaml b/voltha-adapter-simulated/templates/adapters-simulated.yaml
index 2e61898..66a7922 100644
--- a/voltha-adapter-simulated/templates/adapters-simulated.yaml
+++ b/voltha-adapter-simulated/templates/adapters-simulated.yaml
@@ -38,7 +38,7 @@
spec:
containers:
- name: adapter-simulated-olt
- image: {{ tpl .Values.images.adapter_simulated_olt.registry . }}{{ tpl .Values.images.adapter_simulated_olt.repository . }}:{{ tpl .Values.images.adapter_simulated_olt.tag . }}
+ image: {{ tpl .Values.images.adapter_simulated_olt.registry . }}{{ tpl .Values.images.adapter_simulated_olt.repository . }}:{{ tpl ( tpl .Values.images.adapter_simulated_olt.tag . ) . }}
imagePullPolicy: {{ tpl .Values.images.adapter_simulated_olt.pullPolicy . }}
args:
- "/app/simulated_olt"
@@ -77,7 +77,7 @@
spec:
containers:
- name: adapter-simulated-onu
- image: {{ tpl .Values.images.adapter_simulated_onu.registry . }}{{ tpl .Values.images.adapter_simulated_onu.repository . }}:{{ tpl .Values.images.adapter_simulated_onu.tag . }}
+ image: {{ tpl .Values.images.adapter_simulated_onu.registry . }}{{ tpl .Values.images.adapter_simulated_onu.repository . }}:{{ tpl ( tpl .Values.images.adapter_simulated_onu.tag . ) . }}
imagePullPolicy: {{ tpl .Values.images.adapter_simulated_onu.pullPolicy . }}
args:
- "/app/simulated_onu"
diff --git a/voltha-adapter-simulated/values.yaml b/voltha-adapter-simulated/values.yaml
index cc774c7..51741c9 100644
--- a/voltha-adapter-simulated/values.yaml
+++ b/voltha-adapter-simulated/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:
@@ -43,13 +43,13 @@
images:
adapter_simulated_olt:
- registry: '{{ .Values.defaults.image_registry | default "" }}'
- repository: '{{ .Values.defaults.image_org | default "voltha/" }}voltha-adapter-simulated-olt'
- 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-adapter-simulated-olt'
+ tag: '{{ .Values.defaults.image_tag }}'
+ pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'
adapter_simulated_onu:
- registry: '{{ .Values.defaults.image_registry | default "" }}'
- repository: '{{ .Values.defaults.image_org | default "voltha/" }}voltha-adapter-simulated-onu'
- 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-adapter-simulated-onu'
+ tag: '{{ .Values.defaults.image_tag }}'
+ pullPolicy: '{{ .Values.defaults.image_pullPolicy }}'