chore: yq_ibl fix, fix registry to docker

Signed-off-by: Abhinandan Purkait <[email protected]>

Author: Abhinandan-Purkait

deploy/helm/charts/values.yaml

@@ -38,12 +38,12 @@ lvmNode:
   # microk8s where kubelet dir is different
   kubeletDir: "/var/lib/kubelet/"
   resources: {}
-#    limits:
-#      cpu: 10m
-#      memory: 32Mi
-#    requests:
-#      cpu: 10m
-#      memory: 32Mi
+  #    limits:
+  #      cpu: 10m
+  #      memory: 32Mi
+  #    requests:
+  #      cpu: 10m
+  #      memory: 32Mi
   ## Labels to be added to openebs-lvm node pods
   podLabels:
     app: openebs-lvm-node
@@ -121,12 +121,12 @@ lvmController:
   annotations: {}
   podAnnotations: {}
   resources: {}
-#    limits:
-#      cpu: 10m
-#      memory: 32Mi
-#    requests:
-#      cpu: 10m
-#      memory: 32Mi
+  #    limits:
+  #      cpu: 10m
+  #      memory: 32Mi
+  #    requests:
+  #      cpu: 10m
+  #      memory: 32Mi
   ## Labels to be added to openebs-lvm controller pods
   podLabels:
     name: openebs-lvm-controller
@@ -152,7 +152,7 @@ lvmPlugin:
   image:
     # Make sure that registry name end with a '/'.
     # For example : registry.k8s.io/ is a correct value here and quay.io is incorrect
-    registry:
+    registry: docker.io/
     repository: openebs/lvm-driver
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.

scripts/yq_utils.sh

@@ -2,13 +2,12 @@
 # this function gets around that using diff with --ignore-blank-lines
 yq_ibl()
 {
-  set +e
-  diff_out=$(diff -B <(yq '.' "$2") <(yq "$1" "$2")) || error=$?
+  error=0
+  diff_out=$(diff -B <(cat "$2") <(yq "$1" "$2")) || error=$?
   if [ "$error" != "0" ] && [ "$error" != "1" ]; then
     exit "$error"
   fi
   if [ -n "$diff_out" ]; then
     echo "$diff_out" | patch --quiet --no-backup-if-mismatch "$2" -
   fi
-  set -euo pipefail
 }