Fixed multus and go.mod

k8snetworkplumbingwg · Nov 10, 2022 · 48b81f3 · 48b81f3
1 parent 1db8260
commit 48b81f3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/scripts/e2e_get_tools.sh b/scripts/e2e_get_tools.sh
@@ -22,3 +22,5 @@ curl -Lo "${root}/bin/kubectl" "https://storage.googleapis.com/kubernetes-releas
 chmod +x "${root}/bin/kubectl"
 
 export PATH="$PATH:$root/bin"
+
+set +o errexit
diff --git a/scripts/e2e_setup_cluster.sh b/scripts/e2e_setup_cluster.sh
@@ -78,6 +78,8 @@ retry kubectl -n kube-system wait --for=condition=available deploy/coredns --tim
 
 echo "## Install multus"
 retry kubectl create -f "${MULTUS_DAEMONSET_URL}"
+# temporary fix as multus :stable image blocks the pod in "ConteinerCreating" state
+kubectl patch ds kube-multus-ds -n kube-system --type='json' -p='[{"op": "replace","path": "/spec/template/spec/containers/0/image", "value":"ghcr.io/k8snetworkplumbingwg/multus-cni:latest"}]'
 retry kubectl -n kube-system wait --for=condition=ready -l name="${MULTUS_NAME}" pod --timeout="${TIMEOUT}"s
 
 echo "## find KinD container"

diff --git a/test/README.MD b/test/README.MD
@@ -64,7 +64,7 @@ Scripts that creates cluster has to be sourced because they are exporting enviro
 ### How to teardown cluster
 
 ```
-$ ./scripts/e2e_teardown.sh
+$ ./scripts/e2e_teardown_cluster.sh
 ```
 
 ### Current test cases
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,3 +22,5 @@ curl -Lo "${root}/bin/kubectl" "https://storage.googleapis.com/kubernetes-releas
		chmod +x "${root}/bin/kubectl"

		export PATH="$PATH:$root/bin"

		set +o errexit