diff --git a/multus/multus.go b/multus/multus.go index 4653bc739..e67004ce8 100644 --- a/multus/multus.go +++ b/multus/multus.go @@ -611,7 +611,7 @@ func cmdAdd(args *skel.CmdArgs, exec invoke.Exec, kubeClient *k8s.ClientInfo) (c //create the network status, only in case Multus as kubeconfig if n.Kubeconfig != "" && kc != nil { if !types.CheckSystemNamespaces(string(k8sArgs.K8S_POD_NAME), n.SystemNamespaces) { - delegateNetStatus, err := nadutils.CreateNetworkStatus(tmpResult, delegate.Conf.Name, delegate.MasterPlugin) + delegateNetStatus, err := nadutils.CreateNetworkStatus(tmpResult, delegate.Name, delegate.MasterPlugin) if err != nil { return nil, cmdErr(k8sArgs, "error setting network status: %v", err) } diff --git a/multus/multus_test.go b/multus/multus_test.go index 895060ccc..2413b7f77 100644 --- a/multus/multus_test.go +++ b/multus/multus_test.go @@ -34,11 +34,11 @@ import ( cniversion "github.com/containernetworking/cni/pkg/version" "github.com/containernetworking/plugins/pkg/ns" "github.com/containernetworking/plugins/pkg/testutils" + netfake "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/fake" "gopkg.in/intel/multus-cni.v3/k8sclient" "gopkg.in/intel/multus-cni.v3/logging" testhelpers "gopkg.in/intel/multus-cni.v3/testing" "gopkg.in/intel/multus-cni.v3/types" - netfake "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/fake" "k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/tools/record" @@ -1497,8 +1497,8 @@ var _ = Describe("multus operations cniVersion 0.2.0 config", func() { events := collectEvents(recorder.Events) Expect(len(events)).To(Equal(3)) Expect(events[0]).To(Equal("Normal AddedInterface Add eth0 [1.1.1.2/24]")) - Expect(events[1]).To(Equal("Normal AddedInterface Add net1 [1.1.1.3/24] from net1")) - Expect(events[2]).To(Equal("Normal AddedInterface Add net2 [1.1.1.4/24] from net2")) + Expect(events[1]).To(Equal("Normal AddedInterface Add net1 [1.1.1.3/24] from test/net1")) + Expect(events[2]).To(Equal("Normal AddedInterface Add net2 [1.1.1.4/24] from test/net2")) }) It("executes kubernetes networks and delete it after pod removal", func() { diff --git a/types/conf.go b/types/conf.go index 6d04f2419..793f13e12 100644 --- a/types/conf.go +++ b/types/conf.go @@ -17,6 +17,7 @@ package types import ( "encoding/json" + "fmt" "net" "github.com/containernetworking/cni/libcni" @@ -97,7 +98,8 @@ func LoadDelegateNetConf(bytes []byte, net *NetworkSelectionElement, deviceID st if net != nil { if net.Name != "" { - delegateConf.Name = net.Name + // Overwrite CNI config name with net-attach-def name + delegateConf.Name = fmt.Sprintf("%s/%s", net.Namespace, net.Name) } if net.InterfaceRequest != "" { delegateConf.IfnameRequest = net.InterfaceRequest