Using jq to parse the default CNI for improved script robustness (#5190)

* e2e: fix kubevirt vm can't running (#5178)

* Using jq to parse the default CNI for improved script robustness (#5183)

Signed-off-by: Cyclinder Kuo <[email protected]>

---------

Signed-off-by: Cyclinder Kuo <[email protected]>

Author: cyclinder

charts/spiderpool/templates/configmap.yaml

@@ -172,13 +172,14 @@ data:
         cat /host/etc/cni/net.d/${DEFAULT_CNI_FILEPATH}
 
         echo ""
-        DEFAULT_CNI_NAME=$(grep '"name":' ${CNI_CONF_DIR}/${DEFAULT_CNI_FILEPATH} | awk '{print $2}' | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//'  | tr -d ',' | tr -d '"')
+
+        DEFAULT_CNI_NAME=$(jq -r '.name' ${CNI_CONF_DIR}/${DEFAULT_CNI_FILEPATH})
         if [ -z "$DEFAULT_CNI_NAME" ] ; then
           error "The name fleid shouldn't be empty, please check the default cni: ${DEFAULT_CNI_FILEPATH}" && exit 1
         fi
 
         log "Updating the clusterNetwork of the multus-cni config to $DEFAULT_CNI_NAME"
-        sed -i "s?\"clusterNetwork\": \"\"?\"clusterNetwork\": \"${DEFAULT_CNI_NAME}\"?g" /tmp/00-multus.conf
+        jq ".clusterNetwork=\"${DEFAULT_CNI_NAME}\"" /tmp/00-multus.conf > /tmp/00-multus.conf.tmp && mv /tmp/00-multus.conf.tmp /tmp/00-multus.conf
     else
       log "User set multus ClusterNetwork: $MULTUS_CLUSTER_NETWORK"
     fi

images/spiderpool-agent/Dockerfile

@@ -1,7 +1,7 @@
 # Copyright 2022 Authors of spidernet-io
 # SPDX-License-Identifier: Apache-2.0
 
-ARG BASE_IMAGE=ghcr.io/spidernet-io/spiderpool/spiderpool-base:163aca9e9d927363fa80aca7d9721b379671a790
+ARG BASE_IMAGE=ghcr.io/spidernet-io/spiderpool/spiderpool-base:e5de792a4214e67a4d10a6faf476fef3d9f043ca
 ARG GOLANG_IMAGE=docker.io/library/golang:1.23.5@sha256:51a6466e8dbf3e00e422eb0f7a97ac450b2d57b33617bbe8d2ee0bddcd9d0d37
 
 #======= build bin ==========

images/spiderpool-base/install-others.sh

@@ -14,6 +14,7 @@ packages=(
   libmnl0
   bash-completion
   iptables
+  jq
 )