Skip to content

Commit

Permalink
Merge pull request #1264 from flavio-fernandes/9-7-22_merge
Browse files Browse the repository at this point in the history 
[DownstreamMerge] 9-7-22 merge
  • Loading branch information
@openshift-merge-robot
openshift-merge-robot committed Sep 9, 2022
2 parents 9d66bca + 6fd177d commit a0e2733
Show file tree
Hide file tree
Showing 255 changed files with 9,480 additions and 3,531 deletions.
31 changes: 16 additions & 15 deletions go-controller/go.mod
View file
Expand Up @@ -4,30 +4,30 @@ go 1.18

require (
github.com/Mellanox/sriovnet v1.0.3
github.com/Microsoft/hcsshim v0.8.10-0.20200715222032-5eafd1556990
github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae
github.com/Microsoft/hcsshim v0.8.20
github.com/alexflint/go-filemutex v1.1.0
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d
github.com/bhendo/go-powershell v0.0.0-20190719160123-219e7fb4e41e
github.com/cenkalti/backoff/v4 v4.1.3
github.com/containernetworking/cni v0.8.1
github.com/containernetworking/plugins v0.8.7
github.com/coreos/go-iptables v0.4.5
github.com/containernetworking/cni v1.0.1
github.com/containernetworking/plugins v1.1.1
github.com/coreos/go-iptables v0.6.0
github.com/google/uuid v1.2.0
github.com/gorilla/mux v1.8.0
github.com/j-keck/arping v1.0.2
github.com/k8snetworkplumbingwg/network-attachment-definition-client v0.0.0-20200626054723-37f83d1996bc
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.3.0
github.com/miekg/dns v1.1.31
github.com/mitchellh/copystructure v1.2.0
github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.14.0
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.15.0
github.com/openshift/api v0.0.0-20220525145417-ee5b62754c68
github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a
github.com/ovn-org/libovsdb v0.6.1-0.20220901025242-999ca1972a3a
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.12.1
github.com/prometheus/client_model v0.2.0
github.com/safchain/ethtool v0.0.0-20210803160452-9aa261dae9b1
github.com/spf13/afero v1.4.1
github.com/spf13/afero v1.6.0
github.com/stretchr/testify v1.8.0
github.com/urfave/cli/v2 v2.2.0
github.com/vishvananda/netlink v1.1.1-0.20210518155637-4cb3795f2ccb
Expand All @@ -54,8 +54,8 @@ require (
github.com/cenkalti/hub v1.0.1 // indirect
github.com/cenkalti/rpc2 v0.0.0-20210604223624-c1acbc6ec984 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
github.com/containerd/cgroups v1.0.1 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful v2.10.0+incompatible // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
Expand Down Expand Up @@ -87,19 +87,18 @@ require (
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/russross/blackfriday/v2 v2.0.1 // indirect
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/objx v0.4.0 // indirect
github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
go.opencensus.io v0.23.0 // indirect
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1 // indirect
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
Expand All @@ -112,7 +111,9 @@ require (
)

replace (
github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.8.20
github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2
github.com/vishvananda/netlink => github.com/jcaamano/netlink v1.1.1-0.20220831114501-3a761ed61db6
k8s.io/api => k8s.io/api v0.24.0
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.0
k8s.io/apimachinery => k8s.io/apimachinery v0.24.0
Expand Down
502 changes: 446 additions & 56 deletions go-controller/go.sum
View file

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions go-controller/pkg/cni/cni.go
View file
Expand Up @@ -10,7 +10,7 @@ import (
"k8s.io/klog/v2"
utilnet "k8s.io/utils/net"

"github.com/containernetworking/cni/pkg/types/current"
current "github.com/containernetworking/cni/pkg/types/100"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/kube"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
Expand Down Expand Up @@ -278,12 +278,13 @@ func (pr *PodRequest) getCNIResult(podLister corev1listers.PodLister, kclient ku
Interface: current.Int(1),
Address: *ipcidr,
}
var ipVersion string
if utilnet.IsIPv6CIDR(ipcidr) {
ip.Version = "6"
ipVersion = "6"
} else {
ip.Version = "4"
ipVersion = "4"
}
ip.Gateway = gateways[ip.Version]
ip.Gateway = gateways[ipVersion]
ips = append(ips, ip)
}

Expand Down
2 changes: 1 addition & 1 deletion go-controller/pkg/cni/cnishim.go
View file
Expand Up @@ -19,7 +19,7 @@ import (

"github.com/containernetworking/cni/pkg/skel"
"github.com/containernetworking/cni/pkg/types"
"github.com/containernetworking/cni/pkg/types/current"
current "github.com/containernetworking/cni/pkg/types/100"
lumberjack "gopkg.in/natefinch/lumberjack.v2"
"k8s.io/client-go/kubernetes"
"k8s.io/klog/v2"
Expand Down
27 changes: 11 additions & 16 deletions go-controller/pkg/cni/helper_linux.go
View file
Expand Up @@ -20,7 +20,7 @@ import (

"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util"

"github.com/containernetworking/cni/pkg/types/current"
current "github.com/containernetworking/cni/pkg/types/100"
"github.com/containernetworking/plugins/pkg/ip"
"github.com/containernetworking/plugins/pkg/ns"
"github.com/safchain/ethtool"
Expand All @@ -29,7 +29,7 @@ import (

type CNIPluginLibOps interface {
AddRoute(ipn *net.IPNet, gw net.IP, dev netlink.Link, mtu int) error
SetupVeth(contVethName string, hostVethName string, mtu int, hostNS ns.NetNS) (net.Interface, net.Interface, error)
SetupVeth(contVethName string, hostVethName string, mtu int, contVethMac string, hostNS ns.NetNS) (net.Interface, net.Interface, error)
}

type defaultCNIPluginLibOps struct{}
Expand All @@ -48,8 +48,8 @@ func (defaultCNIPluginLibOps) AddRoute(ipn *net.IPNet, gw net.IP, dev netlink.Li
return util.GetNetLinkOps().RouteAdd(route)
}

func (defaultCNIPluginLibOps) SetupVeth(contVethName string, hostVethName string, mtu int, hostNS ns.NetNS) (net.Interface, net.Interface, error) {
return ip.SetupVethWithName(contVethName, hostVethName, mtu, hostNS)
func (defaultCNIPluginLibOps) SetupVeth(contVethName string, hostVethName string, mtu int, contVethMac string, hostNS ns.NetNS) (net.Interface, net.Interface, error) {
return ip.SetupVethWithName(contVethName, hostVethName, mtu, contVethMac, hostNS)
}

// This is a good value that allows fast streams of small packets to be aggregated,
Expand Down Expand Up @@ -149,16 +149,11 @@ func moveIfToNetns(ifname string, netns ns.NetNS) error {
}

func setupNetwork(link netlink.Link, ifInfo *PodInterfaceInfo) error {
// set the mac addresss, set down the interface before changing the mac
// so the EUI64 link local address generated uses the new MAC when we set it up again
if err := util.GetNetLinkOps().LinkSetDown(link); err != nil {
return fmt.Errorf("failed to set down interface %s: %v", link.Attrs().Name, err)
}
if err := util.GetNetLinkOps().LinkSetHardwareAddr(link, ifInfo.MAC); err != nil {
return fmt.Errorf("failed to add mac address %s to %s: %v", ifInfo.MAC, link.Attrs().Name, err)
}
if err := util.GetNetLinkOps().LinkSetUp(link); err != nil {
return fmt.Errorf("failed to set up interface %s: %v", link.Attrs().Name, err)
// make sure link is up
if link.Attrs().Flags&net.FlagUp == 0 {
if err := util.GetNetLinkOps().LinkSetUp(link); err != nil {
return fmt.Errorf("failed to set up interface %s: %v", link.Attrs().Name, err)
}
}

// set the IP address
Expand Down Expand Up @@ -189,7 +184,8 @@ func setupInterface(netns ns.NetNS, containerID, ifName string, ifInfo *PodInter
err := netns.Do(func(hostNS ns.NetNS) error {
// create the veth pair in the container and move host end into host netns
hostIface.Name = containerID[:15]
hostVeth, containerVeth, err := cniPluginLibOps.SetupVeth(ifName, hostIface.Name, ifInfo.MTU, hostNS)
contIface.Mac = ifInfo.MAC.String()
hostVeth, containerVeth, err := cniPluginLibOps.SetupVeth(ifName, hostIface.Name, ifInfo.MTU, contIface.Mac, hostNS)
if err != nil {
return err
}
Expand All @@ -205,7 +201,6 @@ func setupInterface(netns ns.NetNS, containerID, ifName string, ifInfo *PodInter
if err != nil {
return err
}
contIface.Mac = ifInfo.MAC.String()
contIface.Sandbox = netns.Path()

if ifInfo.EnableUDPAggregation {
Expand Down
82 changes: 47 additions & 35 deletions go-controller/pkg/cni/helper_linux_test.go
View file
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/Mellanox/sriovnet"
cnitypes "github.com/containernetworking/cni/pkg/types"
"github.com/containernetworking/cni/pkg/types/current"
current "github.com/containernetworking/cni/pkg/types/100"
"github.com/containernetworking/plugins/pkg/ns"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/cni/mocks"
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/cni/types"
Expand Down Expand Up @@ -191,65 +191,77 @@ func TestSetupNetwork(t *testing.T) {
cniPluginMockHelper []ovntest.TestifyMockHelper
}{
{
desc: "test code path when LinkSetHardwareAddr returns error",
desc: "test code path when AddrAdd returns error",
inpLink: mockLink,
inpPodIfaceInfo: &PodInterfaceInfo{
PodAnnotation: util.PodAnnotation{
MAC: ovntest.MustParseMAC("11:22:33:44:55:66"),
IPs: ovntest.MustParseIPNets("192.168.0.5/24"),
MAC: ovntest.MustParseMAC("0A:58:FD:98:00:01"),
},
},
errMatch: fmt.Errorf("failed to add mac address"),
errMatch: fmt.Errorf("failed to add IP addr"),
netLinkOpsMockHelper: []ovntest.TestifyMockHelper{
{OnCallMethodName: "LinkSetDown", OnCallMethodArgType: []string{"*mocks.Link"}, RetArgList: []interface{}{nil}},
{OnCallMethodName: "LinkSetHardwareAddr", OnCallMethodArgType: []string{"*mocks.Link", "net.HardwareAddr"}, RetArgList: []interface{}{fmt.Errorf("mock error")}},
{OnCallMethodName: "LinkSetUp", OnCallMethodArgType: []string{"*mocks.Link"}, RetArgList: []interface{}{nil}},
{OnCallMethodName: "AddrAdd", OnCallMethodArgType: []string{"*mocks.Link", "*netlink.Addr"}, RetArgList: []interface{}{fmt.Errorf("mock error")}},
},
linkMockHelper: []ovntest.TestifyMockHelper{
{OnCallMethodName: "Attrs", OnCallMethodArgType: []string{}, RetArgList: []interface{}{&netlink.LinkAttrs{Name: "testIfaceName"}}},
{OnCallMethodName: "Attrs", OnCallMethodArgType: []string{}, RetArgList: []interface{}{&netlink.LinkAttrs{Name: "testIfaceName"}}},
},
},
{
desc: "test code path when AddrAdd returns error",
desc: "test code path when AddRoute for gateway returns error",
inpLink: mockLink,
inpPodIfaceInfo: &PodInterfaceInfo{
PodAnnotation: util.PodAnnotation{
IPs: ovntest.MustParseIPNets("192.168.0.5/24"),
MAC: ovntest.MustParseMAC("0A:58:FD:98:00:01"),
IPs: ovntest.MustParseIPNets("192.168.0.5/24"),
MAC: ovntest.MustParseMAC("0A:58:FD:98:00:01"),
Gateways: ovntest.MustParseIPs("192.168.0.1"),
},
},
errMatch: fmt.Errorf("failed to add IP addr"),
errMatch: fmt.Errorf("failed to add gateway route"),
netLinkOpsMockHelper: []ovntest.TestifyMockHelper{
{OnCallMethodName: "LinkSetDown", OnCallMethodArgType: []string{"*mocks.Link"}, RetArgList: []interface{}{nil}},
{OnCallMethodName: "LinkSetHardwareAddr", OnCallMethodArgType: []string{"*mocks.Link", "net.HardwareAddr"}, RetArgList: []interface{}{nil}},
{OnCallMethodName: "LinkSetUp", OnCallMethodArgType: []string{"*mocks.Link"}, RetArgList: []interface{}{nil}},
{OnCallMethodName: "AddrAdd", OnCallMethodArgType: []string{"*mocks.Link", "*netlink.Addr"}, RetArgList: []interface{}{fmt.Errorf("mock error")}},
{OnCallMethodName: "AddrAdd", OnCallMethodArgType: []string{"*mocks.Link", "*netlink.Addr"}, RetArgList: []interface{}{nil}},
},
cniPluginMockHelper: []ovntest.TestifyMockHelper{
{OnCallMethodName: "AddRoute", OnCallMethodArgType: []string{"*net.IPNet", "net.IP", "*mocks.Link", "int"}, RetArgList: []interface{}{fmt.Errorf("mock error")}},
},
linkMockHelper: []ovntest.TestifyMockHelper{
{OnCallMethodName: "Attrs", OnCallMethodArgType: []string{}, RetArgList: []interface{}{&netlink.LinkAttrs{Name: "testIfaceName"}}},
},
},
{
desc: "test code path when AddRoute for gateway returns error",
desc: "test code path when AddRoute for pod returns error",
inpLink: mockLink,
inpPodIfaceInfo: &PodInterfaceInfo{
PodAnnotation: util.PodAnnotation{
IPs: ovntest.MustParseIPNets("192.168.0.5/24"),
MAC: ovntest.MustParseMAC("0A:58:FD:98:00:01"),
Gateways: ovntest.MustParseIPs("192.168.0.1"),
Routes: []util.PodRoute{
{
Dest: ovntest.MustParseIPNet("192.168.1.0/24"),
NextHop: net.ParseIP("192.168.1.1"),
},
},
},
},
errMatch: fmt.Errorf("failed to add gateway route"),
errMatch: fmt.Errorf("failed to add pod route"),
netLinkOpsMockHelper: []ovntest.TestifyMockHelper{
{OnCallMethodName: "LinkSetDown", OnCallMethodArgType: []string{"*mocks.Link"}, RetArgList: []interface{}{nil}},
{OnCallMethodName: "LinkSetHardwareAddr", OnCallMethodArgType: []string{"*mocks.Link", "net.HardwareAddr"}, RetArgList: []interface{}{nil}},
{OnCallMethodName: "LinkSetUp", OnCallMethodArgType: []string{"*mocks.Link"}, RetArgList: []interface{}{nil}},
{OnCallMethodName: "AddrAdd", OnCallMethodArgType: []string{"*mocks.Link", "*netlink.Addr"}, RetArgList: []interface{}{nil}},
},
cniPluginMockHelper: []ovntest.TestifyMockHelper{
{OnCallMethodName: "AddRoute", OnCallMethodArgType: []string{"*net.IPNet", "net.IP", "*mocks.Link"}, RetArgList: []interface{}{fmt.Errorf("mock error")}},
{OnCallMethodName: "AddRoute", OnCallMethodArgType: []string{"*net.IPNet", "net.IP", "*mocks.Link", "int"}, RetArgList: []interface{}{nil}},
{OnCallMethodName: "AddRoute", OnCallMethodArgType: []string{"*net.IPNet", "net.IP", "*mocks.Link", "int"}, RetArgList: []interface{}{fmt.Errorf("mock error")}},
},
linkMockHelper: []ovntest.TestifyMockHelper{
{OnCallMethodName: "Attrs", OnCallMethodArgType: []string{}, RetArgList: []interface{}{&netlink.LinkAttrs{Name: "testIfaceName"}}},
},
},
{
desc: "test code path when AddRoute for pod returns error",
desc: "test success path",
inpLink: mockLink,
inpPodIfaceInfo: &PodInterfaceInfo{
PodAnnotation: util.PodAnnotation{
Expand All @@ -264,20 +276,20 @@ func TestSetupNetwork(t *testing.T) {
},
},
},
errMatch: fmt.Errorf("failed to add pod route"),
netLinkOpsMockHelper: []ovntest.TestifyMockHelper{
{OnCallMethodName: "LinkSetDown", OnCallMethodArgType: []string{"*mocks.Link"}, RetArgList: []interface{}{nil}},
{OnCallMethodName: "LinkSetHardwareAddr", OnCallMethodArgType: []string{"*mocks.Link", "net.HardwareAddr"}, RetArgList: []interface{}{nil}},
{OnCallMethodName: "LinkSetUp", OnCallMethodArgType: []string{"*mocks.Link"}, RetArgList: []interface{}{nil}},
{OnCallMethodName: "AddrAdd", OnCallMethodArgType: []string{"*mocks.Link", "*netlink.Addr"}, RetArgList: []interface{}{nil}},
},
cniPluginMockHelper: []ovntest.TestifyMockHelper{
{OnCallMethodName: "AddRoute", OnCallMethodArgType: []string{"*net.IPNet", "net.IP", "*mocks.Link"}, RetArgList: []interface{}{nil}},
{OnCallMethodName: "AddRoute", OnCallMethodArgType: []string{"*net.IPNet", "net.IP", "*mocks.Link"}, RetArgList: []interface{}{fmt.Errorf("mock error")}},
{OnCallMethodName: "AddRoute", OnCallMethodArgType: []string{"*net.IPNet", "net.IP", "*mocks.Link", "int"}, RetArgList: []interface{}{nil}},
{OnCallMethodName: "AddRoute", OnCallMethodArgType: []string{"*net.IPNet", "net.IP", "*mocks.Link", "int"}, RetArgList: []interface{}{nil}},
},
linkMockHelper: []ovntest.TestifyMockHelper{
{OnCallMethodName: "Attrs", OnCallMethodArgType: []string{}, RetArgList: []interface{}{&netlink.LinkAttrs{Name: "testIfaceName"}}},
},
},
{
desc: "test success path",
desc: "test container link already set up",
inpLink: mockLink,
inpPodIfaceInfo: &PodInterfaceInfo{
PodAnnotation: util.PodAnnotation{
Expand All @@ -293,14 +305,14 @@ func TestSetupNetwork(t *testing.T) {
},
},
netLinkOpsMockHelper: []ovntest.TestifyMockHelper{
{OnCallMethodName: "LinkSetDown", OnCallMethodArgType: []string{"*mocks.Link"}, RetArgList: []interface{}{nil}},
{OnCallMethodName: "LinkSetHardwareAddr", OnCallMethodArgType: []string{"*mocks.Link", "net.HardwareAddr"}, RetArgList: []interface{}{nil}},
{OnCallMethodName: "LinkSetUp", OnCallMethodArgType: []string{"*mocks.Link"}, RetArgList: []interface{}{nil}},
{OnCallMethodName: "AddrAdd", OnCallMethodArgType: []string{"*mocks.Link", "*netlink.Addr"}, RetArgList: []interface{}{nil}},
},
cniPluginMockHelper: []ovntest.TestifyMockHelper{
{OnCallMethodName: "AddRoute", OnCallMethodArgType: []string{"*net.IPNet", "net.IP", "*mocks.Link"}, RetArgList: []interface{}{nil}},
{OnCallMethodName: "AddRoute", OnCallMethodArgType: []string{"*net.IPNet", "net.IP", "*mocks.Link"}, RetArgList: []interface{}{nil}},
{OnCallMethodName: "AddRoute", OnCallMethodArgType: []string{"*net.IPNet", "net.IP", "*mocks.Link", "int"}, RetArgList: []interface{}{nil}},
{OnCallMethodName: "AddRoute", OnCallMethodArgType: []string{"*net.IPNet", "net.IP", "*mocks.Link", "int"}, RetArgList: []interface{}{nil}},
},
linkMockHelper: []ovntest.TestifyMockHelper{
{OnCallMethodName: "Attrs", OnCallMethodArgType: []string{}, RetArgList: []interface{}{&netlink.LinkAttrs{Name: "testIfaceName", Flags: net.FlagUp}}},
},
},
}
Expand Down Expand Up @@ -750,9 +762,9 @@ func TestPodRequest_deletePodConntrack(t *testing.T) {
},
},
inpPrevResult: &current.Result{
CNIVersion: "0.4.0",
CNIVersion: "1.0.0",
Interfaces: []*current.Interface{{Name: "eth0"}},
IPs: []*current.IPConfig{{Version: "4", Interface: &[]int{0}[0], Address: *ovntest.MustParseIPNet("192.168.1.15/24"), Gateway: ovntest.MustParseIP("192.168.1.1")}},
IPs: []*current.IPConfig{{Interface: &[]int{0}[0], Address: *ovntest.MustParseIPNet("192.168.1.15/24"), Gateway: ovntest.MustParseIP("192.168.1.1")}},
},
},
{
Expand All @@ -765,9 +777,9 @@ func TestPodRequest_deletePodConntrack(t *testing.T) {
},
},
inpPrevResult: &current.Result{
CNIVersion: "0.4.0",
CNIVersion: "1.0.0",
Interfaces: []*current.Interface{{Name: "eth0", Sandbox: "blah"}},
IPs: []*current.IPConfig{{Version: "4", Interface: &[]int{0}[0], Address: *ovntest.MustParseIPNet("192.168.1.15/24"), Gateway: ovntest.MustParseIP("192.168.1.1")}},
IPs: []*current.IPConfig{{Interface: &[]int{0}[0], Address: *ovntest.MustParseIPNet("192.168.1.15/24"), Gateway: ovntest.MustParseIP("192.168.1.1")}},
},
netLinkOpsMockHelper: []ovntest.TestifyMockHelper{
{OnCallMethodName: "ConntrackDeleteFilter", OnCallMethodArgType: []string{"netlink.ConntrackTableType", "netlink.InetFamily", "*netlink.ConntrackFilter"}, RetArgList: []interface{}{uint(1), fmt.Errorf("mock error")}},
Expand All @@ -787,7 +799,7 @@ func TestPodRequest_deletePodConntrack(t *testing.T) {
} else {
tc.inpPodRequest.CNIConf.PrevResult, err = current.NewResult(res)
if err != nil {
t.Fatal("NewResult failed")
t.Fatal("NewResult failed", err)
}
}
}
Expand Down

0 comments on commit a0e2733

Please sign in to comment.