commit a0fc940584e01e257901c4f2daec9451c09cdae0
author Matteo Scandolo <matteo.scandolo@gmail.com> Fri Apr 09 16:09:03 2021 -0700
committer Matteo Scandolo <matteo.scandolo@gmail.com> Tue Apr 20 11:02:28 2021 -0700
tree 1ce8e3e2798e428274c332a2abe5e0e6cafc3994
parent c2c917a30091a590ee0d47b9c09c9efd727db644

Customizing onos-config-loader image via values.yaml in voltha-infra
Using onos-classic 0.1.15 to correctly select nodePorts pods

Change-Id: I5fe3e74a07541eca9337c5002e4d9be614e98356

voltha-infra/Chart.yaml

diff --git a/voltha-infra/Chart.yaml b/voltha-infra/Chart.yaml
index 02b9783..528c209 100644
--- a/voltha-infra/Chart.yaml
+++ b/voltha-infra/Chart.yaml
@@ -29,12 +29,12 @@
 name: voltha-infra
 
 appVersion: "2.8-dev"
-version: 0.2.0
+version: 0.2.1
 
 dependencies:
   - name: onos-classic
     repository: https://charts.onosproject.org
-    version: 0.1.13
+    version: 0.1.15
     condition: onos-classic.enabled
   - name: bbsim-sadis-server
     repository: https://charts.opencord.org

voltha-infra/templates/onos-config-loader.yaml

diff --git a/voltha-infra/templates/onos-config-loader.yaml b/voltha-infra/templates/onos-config-loader.yaml
index f018eeb..0c04cdc 100644
--- a/voltha-infra/templates/onos-config-loader.yaml
+++ b/voltha-infra/templates/onos-config-loader.yaml
@@ -36,8 +36,8 @@
       serviceAccountName: "{{ .Release.Name }}-onos-config-loader-service-account"
       containers:
         - name: onos-config-loader
-          image: voltha/voltha-ci-tools:2.3.2-onos-config-loader
-          imagePullPolicy: Always
+          image: '{{ tpl .Values.images.onos_config_loader.registry . }}{{ tpl .Values.images.onos_config_loader.repository . }}:{{ tpl .Values.images.onos_config_loader.tag . }}'
+          imagePullPolicy: {{ tpl .Values.images.onos_config_loader.pullPolicy . }}
           command:
             - "/bin/bash"
             - "/opt/loader/loader.sh"

voltha-infra/values.yaml

diff --git a/voltha-infra/values.yaml b/voltha-infra/values.yaml
index 576507b..d6156cc 100644
--- a/voltha-infra/values.yaml
+++ b/voltha-infra/values.yaml
@@ -15,6 +15,19 @@
 # Default values for voltha-infra.
 # This is a YAML-formatted file.
 
+global:
+  image_registry: ''
+  image_org: "voltha/"
+  image_tag: ~
+  image_pullPolicy: "Always"
+
+images:
+  onos_config_loader:
+    registry: '{{ .Values.global.image_registry }}'
+    repository: '{{ .Values.global.image_org }}voltha-ci-tools'
+    tag: '{{- if hasKey .Values.global "image_tag" }}{{- if .Values.global.image_tag }}{{ .Values.global.image_tag }}{{- else }}2.3.2-onos-config-loader{{- end }}{{- else }}2.3.2-onos-config-loader{{- end }}'
+    pullPolicy: '{{ .Values.global.image_pullPolicy }}'
+
 # components config
 onos-classic:
   enabled: true