commit 43f2df528e0f10054409305df88b7cfa01929311
author David Bainbridge <dbainbri@ciena.com> Tue Jun 02 15:30:54 2020 -0700
committer David Bainbridge <dbainbri@ciena.com> Tue Jun 02 15:31:00 2020 -0700
tree f60c7745364546a9019ffa658844b1ed0027f9a1
parent c722062ebd311bf693ad03b2afaeec9079b41f63

change how files are pushed to yq

Change-Id: I926a7d68ce40a7903ec32a73cfa34707ba3c9b7a

voltha

diff --git a/voltha b/voltha
index e1aa3a5..e44e1df 100755
--- a/voltha
+++ b/voltha
@@ -1136,7 +1136,7 @@
     if [ "$FILTER" == "-" ]; then
         cp "$NAME-values.yaml" "$VALUES_FILE"
     else
-        yq r "$NAME-values.yaml" "$FILTER" >"$VALUES_FILE"
+        yq r - "$FILTER" <"$NAME-values.yaml" >"$VALUES_FILE"
     fi
     if [ "$WITH_PPROF" == "yes" ]; then
         PPROF_ARG="--set profiler.enabled=true"
@@ -1841,8 +1841,7 @@
 if is_in "$WITH_ETCD" "yes,external"; then
     STIME="$(date +%s)"
     bspin "Verify external ETCD cluster $OLD_KEY"
-    EXPECT="$(yq r "$NAME-values.yaml" "etcd.replicas")"
-#    DKB
+    EXPECT="$(yq r - "etcd.replicas" <"$NAME-values.yaml")"
     if [ "$HELM_USE_UPGRADE" == "yes" ] || [ "$(helm list --deployed --short --namespace "$INFRA_NS" "^etcd\$" | wc -l)" -ne 1 ]; then
         espin "$NOT_VERIFIED"
         helm_install - "$INFRA_NS" etcd "$ETCD_CHART" "$ETCD_CHART_VERSION" etcd "$_HELM_DESC external ETCD cluster"