From af74d5241f9035953eec20c84340b5fad675ca2c Mon Sep 17 00:00:00 2001 From: Or Mergi Date: Tue, 13 Dec 2022 09:11:44 +0200 Subject: [PATCH] k8s, cluster-up: Copy istio CNI net conf to where Multus expects Since Multus v4 it expects CNI net conf file to exist at '/etc/cni/net.d' but isitio generates then at '/etc/cni/multus/net.d'. Copy istio CNI net conf to where multus expects on cluster-up in order to enable deploying both Isitio and Multus v4 until proper solution is available, tracking issue [1] [2]. [1] https://github.com/kubevirt/kubevirtci/issues/906 [2] https://github.com/k8snetworkplumbingwg/multus-cni/issues/982 Signed-off-by: Or Mergi --- cluster-up/cluster/k8s-provider-common.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/cluster-up/cluster/k8s-provider-common.sh b/cluster-up/cluster/k8s-provider-common.sh index 3882a2e50b..ff38738ea9 100644 --- a/cluster-up/cluster/k8s-provider-common.sh +++ b/cluster-up/cluster/k8s-provider-common.sh @@ -88,6 +88,16 @@ function wait_for_istio_ready() { fi } +# copy_istio_cni_conf_files copy the generated Istio CNI net conf file +# (at '/etc/cni/multus/net.d/') to where Multus expect CNI net conf files ('/etc/cni/net.d/') +function copy_istio_cni_conf_files() { + if [ "$KUBEVIRT_DEPLOY_ISTIO" == "true" ] && [ "$KUBEVIRT_WITH_CNAO" == "true" ]; then + for nodeNum in $(seq -f "%02g" 1 $KUBEVIRT_NUM_NODES); do + $ssh node${nodeNum} -- sudo cp -uv /etc/cni/multus/net.d/*istio*.conf /etc/cni/net.d/ + done + fi +} + function deploy_cdi() { if [ "$KUBEVIRT_DEPLOY_CDI" == "true" ]; then $kubectl create -f /opt/cdi-*-operator.yaml @@ -155,4 +165,8 @@ function up() { sleep 5 done + # FIXME: remove 'copy_istio_cni_conf_files()' as soon as [1] and [2] are resolved + # [1] https://github.com/kubevirt/kubevirtci/issues/906 + # [2] https://github.com/k8snetworkplumbingwg/multus-cni/issues/982 + copy_istio_cni_conf_files }