Merge pull request #9396 from dovics/cniresult

fix: include new fields in cni Add success result

Author: marvin-tigera

cni-plugin/pkg/k8s/k8s.go

@@ -533,8 +533,11 @@ func CmdAddK8s(ctx context.Context, args *skel.CmdArgs, conf types.NetConf, epID
 
 	// Add the interface created above to the CNI result.
 	result.Interfaces = append(result.Interfaces, &cniv1.Interface{
-		Name: endpoint.Spec.InterfaceName},
-	)
+		Name:    endpoint.Spec.InterfaceName,
+		Mac:     endpoint.Spec.MAC,
+		Mtu:     conf.MTU,
+		Sandbox: args.Netns,
+	})
 
 	// Conditionally wait for host-local Felix to program the policy for this WEP.
 	// Error if negative, ignore if 0.

cni-plugin/pkg/plugin/plugin.go

@@ -509,8 +509,11 @@ func cmdAdd(args *skel.CmdArgs) (err error) {
 
 		// Add the interface created above to the CNI result.
 		result.Interfaces = append(result.Interfaces, &cniv1.Interface{
-			Name: endpoint.Spec.InterfaceName},
-		)
+			Name:    endpoint.Spec.InterfaceName,
+			Mac:     endpoint.Spec.MAC,
+			Mtu:     conf.MTU,
+			Sandbox: args.Netns,
+		})
 	}
 
 	// Handle profile creation - this is only done if there isn't a specific policy handler.

cni-plugin/tests/calico_cni_k8s_test.go

@@ -2577,6 +2577,15 @@ var _ = Describe("Kubernetes CNI tests", func() {
 			// Otherwise, they should be the same.
 			resultSecondAdd.IPs = nil
 			result.IPs = nil
+
+			// The MAC address will be different, since we create a new veth.
+			Expect(len(resultSecondAdd.Interfaces)).Should(Equal(len(result.Interfaces)))
+			for i := range resultSecondAdd.Interfaces {
+				Expect(resultSecondAdd.Interfaces[i].Mac).ShouldNot(Equal(result.Interfaces[i].Mac))
+				resultSecondAdd.Interfaces[i].Mac = ""
+				result.Interfaces[i].Mac = ""
+			}
+
 			Expect(resultSecondAdd).Should(Equal(result))
 
 			// IPAM reservation should still be in place.