chore: yq_ibl fix, fix registry to docker, fix release wf

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

Author: Abhinandan-Purkait

.github/workflows/release.yml

@@ -94,7 +94,7 @@ jobs:
 
       - name: Update the registry and the repository
         run: |
-          nix-shell --pure --run "./scripts/update-reg-repo.sh --registry docker.io/ --namespace ${{ env.IMAGE_ORG }}/zfs-driver" ./shell.nix
+          nix-shell --pure --run "./scripts/update-reg-repo.sh --registry docker.io/ --repository ${{ env.IMAGE_ORG }}/zfs-driver" ./shell.nix
 
       - name: Publish chart via helm-gh-pages
         uses: stefanprodan/helm-gh-pages@master

deploy/helm/charts/values.yaml

@@ -142,7 +142,7 @@ zfsPlugin:
   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/zfs-driver
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.

scripts/update-reg-repo.sh

@@ -37,7 +37,7 @@ while [ "$#" -gt 0 ]; do
       ;;
     --repository)
       shift
-      NEW_NAMESPACE=$1
+      NEW_REPOSITORY=$1
       shift
       ;;
     *)
@@ -51,9 +51,9 @@ if [ -z "${NEW_REGISTRY:-}" ]; then
   log_fatal "Missing required flag: --registry"
 fi
 
-if [ -z "${NEW_NAMESPACE:-}" ]; then
+if [ -z "${NEW_REPOSITORY:-}" ]; then
   log_fatal "Missing required flag: --repository"
 fi
 
 yq_ibl ".zfsPlugin.image.registry = \"$NEW_REGISTRY\"" "$VALUES_YAML"
-yq_ibl ".zfsPlugin.image.repository = \"$NEW_NAMESPACE\"" "$VALUES_YAML"
+yq_ibl ".zfsPlugin.image.repository = \"$NEW_REPOSITORY\"" "$VALUES_YAML"

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
 }