From 2f3923c6f035a184dd96078800f37ebb676da147 Mon Sep 17 00:00:00 2001 From: wujixin <599230270@qq.com> Date: Mon, 20 Nov 2023 15:35:52 +0800 Subject: [PATCH] fix: multus network status not find dpdk interface name (#3432) Signed-off-by: wujixin Co-authored-by: wujixin --- pkg/daemon/handler.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/daemon/handler.go b/pkg/daemon/handler.go index 7f3111ad1a0..c5edd35c9f1 100644 --- a/pkg/daemon/handler.go +++ b/pkg/daemon/handler.go @@ -287,13 +287,13 @@ func (csh cniServerHandler) handleAdd(req *restful.Request, resp *restful.Respon routes = append(podRequest.Routes, routes...) macAddr = pod.Annotations[fmt.Sprintf(util.MacAddressAnnotationTemplate, podRequest.Provider)] klog.Infof("create container interface %s mac %s, ip %s, cidr %s, gw %s, custom routes %v", ifName, macAddr, ipAddr, cidr, gw, routes) + podNicName = ifName switch nicType { case util.InternalType: podNicName, err = csh.configureNicWithInternalPort(podRequest.PodName, podRequest.PodNamespace, podRequest.Provider, podRequest.NetNs, podRequest.ContainerID, ifName, macAddr, mtu, ipAddr, gw, isDefaultRoute, detectIPConflict, routes, podRequest.DNS.Nameservers, podRequest.DNS.Search, ingress, egress, podRequest.DeviceID, nicType, latency, limit, loss, jitter, gatewayCheckMode, u2oInterconnectionIP) case util.DpdkType: err = csh.configureDpdkNic(podRequest.PodName, podRequest.PodNamespace, podRequest.Provider, podRequest.NetNs, podRequest.ContainerID, ifName, macAddr, mtu, ipAddr, gw, ingress, egress, getShortSharedDir(pod.UID, podRequest.VhostUserSocketVolumeName), podRequest.VhostUserSocketName) default: - podNicName = ifName err = csh.configureNic(podRequest.PodName, podRequest.PodNamespace, podRequest.Provider, podRequest.NetNs, podRequest.ContainerID, podRequest.VfDriver, ifName, macAddr, mtu, ipAddr, gw, isDefaultRoute, detectIPConflict, routes, podRequest.DNS.Nameservers, podRequest.DNS.Search, ingress, egress, podRequest.DeviceID, nicType, latency, limit, loss, jitter, gatewayCheckMode, u2oInterconnectionIP) } if err != nil {