commit e0829b56e18da93c80cd7a014a2f6ee1a6067e54
author Matteo Scandolo <matteo.scandolo@gmail.com> Fri May 08 14:23:56 2020 -0700
committer Suchitra Vemuri <suchitra@opennetworking.org> Wed May 13 22:46:10 2020 +0000
tree 8725363b3b7174b0ce57f538e72699c1ce110a9a
parent 65c3519fcf1b71aa505e30f3fb43731f224d238e

Configuring ONOS-classic pullPolicy

Change-Id: I3bb7b63e5e15db9359e823b19ced40ead7676142

minimal-values.yaml

diff --git a/minimal-values.yaml b/minimal-values.yaml
index 1804096..944dd9e 100644
--- a/minimal-values.yaml
+++ b/minimal-values.yaml
@@ -23,6 +23,7 @@
 # this block and replace "<VALUE>" with "voltha-2.1".
 defaults:
   image_tag: master
+  image_pullPolicy: Always
 
 # OFAGENT IMPLEMENTATION
 # ----------------------

voltha

diff --git a/voltha b/voltha
index c83e1ad..10eb4f8 100755
--- a/voltha
+++ b/voltha
@@ -1639,18 +1639,19 @@
         bspin "Verify ONOS CLASSIC installed $BIRD"
         if [ "$HELM_USE_UPGRADE" == "yes" ] || [ "$(helm list --deployed --short --namespace "$INFRA_NS" "^onos\$" | wc -l)" -ne 1 ]; then
             espin "$NOT_VERIFIED"
-            # ONOS CLASSIC identifies its image repo/tag differently, so yq is used to grab the values from the
+            # ONOS CLASSIC identifies its image repo/tag/pullPolicy differently, so yq is used to grab the values from the
             # values value
             YAML_VALUES=$(INTERNAL_EXTRA_HELM_INSTALL_ARGS="--set replicas=$NUM_OF_ONOS --set atomix.replicas=$NUM_OF_ATOMIX" \
                 helm_values "$INFRA_NS" onos "$ONOS_CLASSIC_CHART" "$ONOS_CLASSIC_CHART_VERSION")
             _ONOS_REPO="$(echo "$YAML_VALUES" | yq read - images.onos.repository)"
             _ONOS_TAG="$(echo "$YAML_VALUES" | yq read - images.onos.tag)"
+            _ONOS_PULL_POLICY="$(echo "$YAML_VALUES" | yq read - defaults.image_pullPolicy)"
             _TAG_DEFAULT="$(echo "$YAML_VALUES" | yq read - defaults.image_tag)"
             if [ -z "$_ONOS_TAG" ]; then
                 _ONOS_TAG="$_TAG_DEFAULT"
             fi
 
-            INTERNAL_EXTRA_HELM_INSTALL_ARGS="--set image.repository=$_ONOS_REPO --set image.tag=$_ONOS_TAG --set replicas=$NUM_OF_ONOS --set atomix.replicas=$NUM_OF_ATOMIX" \
+            INTERNAL_EXTRA_HELM_INSTALL_ARGS="--set image.pullPolicy=$_ONOS_PULL_POLICY,image.repository=$_ONOS_REPO,image.tag=$_ONOS_TAG,replicas=$NUM_OF_ONOS,atomix.replicas=$NUM_OF_ATOMIX" \
                 helm_install - "$INFRA_NS" onos "$ONOS_CLASSIC_CHART" "$ONOS_CLASSIC_CHART_VERSION" "$_HELM_DESC ONOS CLASSIC"
             INTERNAL_EXTRA_HELM_INSTALL_ARGS=
         else