From 9fbc8db799177e67c6100152ba706c8e934bb73e Mon Sep 17 00:00:00 2001 From: Kuralamudhan Ramakrishnan Date: Tue, 6 Oct 2020 13:19:40 -0700 Subject: fixing interface names for the cni-proxy related cni plugins Signed-off-by: Kuralamudhan Ramakrishnan Change-Id: I136c26213840881087ac18bac0778046807632ac --- internal/pkg/cniserver/cni.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'internal') diff --git a/internal/pkg/cniserver/cni.go b/internal/pkg/cniserver/cni.go index ee848f7..7bfd0a1 100644 --- a/internal/pkg/cniserver/cni.go +++ b/internal/pkg/cniserver/cni.go @@ -140,7 +140,11 @@ func (cr *CNIServerRequest) addMultipleInterfaces(ovnAnnotation, namespace, podN defaultGateway = "true" } - klog.Infof("addMultipleInterfaces: ipAddress %v %v", ipAddress, interfaceName) + if interfaceName == "*" && cr.IfName != "eth0" { + defaultGateway = "false" + } + + klog.Infof("addMultipleInterfaces: ipAddress-%v ovn4nfv-interface-%v cni-ifname-%v", ipAddress, interfaceName, cr.IfName) interfacesArray, err = app.ConfigureInterface(cr.Netns, cr.SandboxID, cr.IfName, namespace, podName, macAddress, ipAddress, gatewayIP, interfaceName, defaultGateway, index, config.Default.MTU, isDefaultGW) if err != nil { klog.Errorf("Failed to configure interface in pod: %v", err) -- cgit 1.2.3-korg