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

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

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

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

---------

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

Author: cyclinder

Makefile

@@ -343,7 +343,7 @@ e2e_test:
 
 .PHONY: e2e_test_spiderpool
 e2e_test_spiderpool:
-	$(QUIET)  make e2e_test -e INSTALL_OVERLAY_CNI=false -e E2E_SPIDERPOOL_ENABLE_SUBNET=true 
+	$(QUIET)  make e2e_test -e INSTALL_OVERLAY_CNI=false -e E2E_SPIDERPOOL_ENABLE_SUBNET=true
 
 .PHONY: e2e_test_calico
 e2e_test_calico:

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,8 +1,8 @@
 # Copyright 2022 Authors of spidernet-io
 # SPDX-License-Identifier: Apache-2.0
 
-ARG BASE_IMAGE=ghcr.io/spidernet-io/spiderpool/spiderpool-base:163aca9e9d927363fa80aca7d9721b379671a790
-ARG GOLANG_IMAGE=docker.io/library/golang:1.24.2
+ARG BASE_IMAGE=ghcr.io/spidernet-io/spiderpool/spiderpool-base:e5de792a4214e67a4d10a6faf476fef3d9f043ca
+ARG GOLANG_IMAGE=docker.io/library/golang:1.24.5@sha256:14fd8a55e59a560704e5fc44970b301d00d344e45d6b914dda228e09f359a088
 
 #======= build bin ==========
 FROM --platform=${BUILDPLATFORM} ${GOLANG_IMAGE} AS builder

images/spiderpool-base/install-others.sh

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

test/scripts/debugEnv.sh

@@ -203,6 +203,14 @@ elif [ "$TYPE"x == "detail"x ] ; then
     echo "--------- kubectl get configmaps -n kube-system spiderpool-conf -ojson"
     kubectl get configmaps -n kube-system spiderpool-conf -ojson --kubeconfig ${E2E_KUBECONFIG}
 
+    echo ""
+    echo "--------- kubectl get virtualmachineinstance -A -o json"
+    kubectl get virtualmachineinstance -A -o json --kubeconfig ${E2E_KUBECONFIG}
+
+    echo ""
+    echo "--------- kubectl get virtualmachine -A -o json"
+    kubectl get virtualmachine -A -o json --kubeconfig ${E2E_KUBECONFIG}
+
     echo ""
     echo "=============== IPAM log  ============== "
     KIND_CLUSTER_NAME=${KIND_CLUSTER_NAME:-"spider"}

test/scripts/install-kubevirt.sh

@@ -64,7 +64,9 @@ kubectl wait --for=condition=ready -l app.kubernetes.io/component=kubevirt -n ku
 # If the kind cluster runs on a virtual machine consider enabling nested virtualization.
 # Enable the network Passt and LiveMigration feature.
 # We need to wait for all kubevirt component pods ready(webhook ready) to submit the patch action.
-kubectl -n kubevirt patch kubevirt kubevirt --type=merge --patch '{"spec":{"configuration":{"developerConfiguration":{"useEmulation":true,"featureGates": ["Passt"]}}}}' --kubeconfig ${E2E_KUBECONFIG}
+# NOTE: set "disableSerialConsoleLog" to avoid the log of serial console issue, it leads to the kubevirt vm pod can't running
+# see: https://github.com/kubevirt/kubevirt/issues/15355, https://github.com/spidernet-io/spiderpool/issues/5177
+kubectl -n kubevirt patch kubevirt kubevirt --type=merge --patch '{"spec":{"configuration":{"developerConfiguration":{"useEmulation":true},"virtualMachineOptions": {"disableSerialConsoleLog": {},"featureGates": ["Passt"]}}}}' --kubeconfig ${E2E_KUBECONFIG}
 
 sleep 1