From 2ea064a7f93a19b730c1aba8e5eb82b86d070bcd Mon Sep 17 00:00:00 2001 From: AbdYsn Date: Wed, 6 Oct 2021 20:16:36 +0300 Subject: [PATCH] Fix Mellanox CI multus file not found (#2861) Following multus patch https://github.com/k8snetworkplumbingwg/multus-cni/pull/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 --- ci/jenkins/mellanox/common/common_functions.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/jenkins/mellanox/common/common_functions.sh b/ci/jenkins/mellanox/common/common_functions.sh index bb0381c6ff1..234f7b43507 100755 --- a/ci/jenkins/mellanox/common/common_functions.sh +++ b/ci/jenkins/mellanox/common/common_functions.sh @@ -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() { @@ -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=$?