Skip to content

Commit

Permalink
Fix Mellanox CI multus file not found (#2861)
Browse files Browse the repository at this point in the history
Following multus patch k8snetworkplumbingwg/multus-cni#729,
the multus daemonset yaml file location was moved causing Mellanox CI to fail. This
patch fixes that by using the new directory for the multus daemonset.

Signed-off-by: abdallahyas <[email protected]>
  • Loading branch information
abdallahyas authored Oct 6, 2021
1 parent f415bd7 commit 2ea064a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions ci/jenkins/mellanox/common/common_functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ multus_install(){
build_github_project "multus-cni" "sudo docker build -t $MULTUS_CNI_HARBOR_IMAGE ."

change_k8s_resource "DaemonSet" "kube-multus-ds" "spec.template.spec.containers[0].image"\
"$MULTUS_CNI_HARBOR_IMAGE" "$WORKSPACE/multus-cni/images/multus-daemonset.yml"
"$MULTUS_CNI_HARBOR_IMAGE" "$WORKSPACE/multus-cni/deployments/multus-daemonset.yml"
}

multus_configuration() {
Expand All @@ -210,9 +210,9 @@ multus_configuration() {
local arch=$(get_arch)
date
sleep 30
sed -i 's;/etc/cni/net.d/multus.d/multus.kubeconfig;/etc/kubernetes/admin.conf;g' $WORKSPACE/multus-cni/images/multus-daemonset.yml
sed -i 's;/etc/cni/net.d/multus.d/multus.kubeconfig;/etc/kubernetes/admin.conf;g' $WORKSPACE/multus-cni/deployments/multus-daemonset.yml

kubectl create -f $WORKSPACE/multus-cni/images/multus-daemonset.yml
kubectl create -f $WORKSPACE/multus-cni/deployments/multus-daemonset.yml

kubectl -n kube-system get ds
rc=$?
Expand Down

0 comments on commit 2ea064a

Please sign in to comment.