Merge pull request #5026 from SchSeba/fix_multus_networks

stop adding events to NAD if the network type is not ovn-k

Author: tssurya

go-controller/pkg/config/cni.go

@@ -120,10 +120,6 @@ func parseNetConfSingle(bytes []byte) (*ovncnitypes.NetConf, error) {
 }
 
 func parseNetConfList(confList *libcni.NetworkConfigList) (*ovncnitypes.NetConf, error) {
-	if len(confList.Plugins) > 1 {
-		return nil, ErrorChainingNotSupported
-	}
-
 	netconf := &ovncnitypes.NetConf{MTU: Default.MTU}
 	if err := json.Unmarshal(confList.Plugins[0].Bytes, netconf); err != nil {
 		return nil, err
@@ -134,6 +130,10 @@ func parseNetConfList(confList *libcni.NetworkConfigList) (*ovncnitypes.NetConf,
 		return nil, ErrorAttachDefNotOvnManaged
 	}
 
+	if len(confList.Plugins) > 1 {
+		return nil, ErrorChainingNotSupported
+	}
+
 	netconf.Name = confList.Name
 	netconf.CNIVersion = confList.CNIVersion
 

go-controller/pkg/networkmanager/nad_controller.go

@@ -274,6 +274,11 @@ func (c *nadController) syncNAD(key string, nad *nettypes.NetworkAttachmentDefin
 	if nad != nil {
 		nadNetwork, err = util.ParseNADInfo(nad)
 		if err != nil {
+			// in case the type for the NAD is not ovn-k we should not record the error event
+			if err.Error() == util.ErrorAttachDefNotOvnManaged.Error() {
+				return nil
+			}
+
 			if c.recorder != nil {
 				c.recorder.Eventf(&corev1.ObjectReference{Kind: nad.Kind, Namespace: nad.Namespace, Name: nad.Name}, corev1.EventTypeWarning,
 					"InvalidConfig", "Failed to parse network config: %v", err.Error())

go-controller/pkg/networkmanager/nad_controller_test.go

@@ -469,6 +469,21 @@ func TestNADController(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "non ovn-k NAD added",
+			args: []args{
+				{
+					nad: "test/nad_1",
+					network: &ovncnitypes.NetConf{
+						NetConf: cnitypes.NetConf{
+							Name: "test",
+							Type: "sriov",
+						},
+					},
+					wantErr: false,
+				},
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

go-controller/pkg/util/multi_network.go

@@ -1151,6 +1151,9 @@ func ParseNADInfo(nad *nettypes.NetworkAttachmentDefinition) (NetInfo, error) {
 func ParseNetConf(netattachdef *nettypes.NetworkAttachmentDefinition) (*ovncnitypes.NetConf, error) {
 	netconf, err := config.ParseNetConf([]byte(netattachdef.Spec.Config))
 	if err != nil {
+		if err.Error() == ErrorAttachDefNotOvnManaged.Error() {
+			return nil, err
+		}
 		return nil, fmt.Errorf("error parsing Network Attachment Definition %s/%s: %v", netattachdef.Namespace, netattachdef.Name, err)
 	}
 

go-controller/pkg/util/multi_network_test.go

@@ -180,7 +180,7 @@ func TestParseNetconf(t *testing.T) {
             "netAttachDefName": "default/tenantred"
     }
 `,
-			expectedError: fmt.Errorf("error parsing Network Attachment Definition ns1/nad1: net-attach-def not managed by OVN"),
+			expectedError: fmt.Errorf("net-attach-def not managed by OVN"),
 		},
 		{
 			desc: "attachment definition with IPAM key defined, using a wrong type",
@@ -1154,6 +1154,16 @@ func TestSubnetOverlapCheck(t *testing.T) {
                 }
 			`,
 		},
+		{
+			desc: "return error when the network is not ovnk",
+			inputNetAttachDefConfigSpec: `
+                {
+                    "name": "test",
+                    "type": "sriov-cni"
+                }
+			`,
+			expectedError: ErrorAttachDefNotOvnManaged,
+		},
 	}
 
 	for _, test := range tests {