commit f2d080b202c89e4f252d63a9d3c38ff785b5e423
author Matteo Scandolo <matteo.scandolo@gmail.com> Thu Jul 23 13:59:29 2020 -0700
committer Matteo Scandolo <matteo.scandolo@gmail.com> Thu Jul 23 15:39:43 2020 -0700
tree 4326505071d5a59b2f30d26c6fa72f76e5a3f90c
parent 871fd986b9ca872cd46cf3a1db9fe0338e7ae6e7

Using the correct ONOS image in the 2.4 release file

Change-Id: Ib00286596d2b6000b1c68b9c4968b3ebce617cd2

voltha

diff --git a/voltha b/voltha
index a50ce97..955a265 100755
--- a/voltha
+++ b/voltha
@@ -1210,9 +1210,15 @@
         _HELM_ARGS="xxxdryrunxxx"
     else
         _HELM_COMMAND="install"
-        _HELM_ARGS="--name xxxdryrunxxx"
+        if [ "$HELM_MAJOR" -le 2 ]; then
+            _HELM_NAME_ARG="--name xxxdryrunxxx"
+            _HELM_ARGS=
+        else
+            _HELM_NAME_ARG="xxxdryrunxxx"
+            _HELM_ARGS="--create-namespace"
+        fi
     fi
-    CMD=("helm $_HELM_COMMAND --debug --dry-run -f $NAME-values.yaml $CHART_ARGS $INTERNAL_EXTRA_HELM_INSTALL_ARGS $EXTRA_HELM_INSTALL_ARGS --set defaults.log_level=$VOLTHA_LOG_LEVEL --namespace $NAMESPACE $_HELM_ARGS  $CHART_VERSION $EXTRA_HELM_FLAGS $CHART")
+    CMD=("helm $_HELM_COMMAND --debug --dry-run -f $NAME-values.yaml $CHART_ARGS $INTERNAL_EXTRA_HELM_INSTALL_ARGS $EXTRA_HELM_INSTALL_ARGS --set defaults.log_level=$VOLTHA_LOG_LEVEL --namespace $NAMESPACE $_HELM_ARGS  $CHART_VERSION $EXTRA_HELM_FLAGS $_HELM_NAME_ARG $CHART")
    ${CMD[*]} 2>/dev/null | awk 'PRINT==1 {print}; /^USER-SUPPLIED VALUES:/ {PRINT = 1}; /^$/ {PRINT = 0}'
 }