CNI changes for multi-nic support

Author: jaydeokar

cmd/routed-eni-cni-plugin/cni.go

@@ -103,15 +103,19 @@ func TestCmdAdd(t *testing.T) {
 	enforceNpReply := &rpc.EnforceNpReply{Success: true}
 	mockNP.EXPECT().EnforceNpToPod(gomock.Any(), gomock.Any()).Return(enforceNpReply, nil).Times(1)
 
-	addNetworkReply := &rpc.AddNetworkReply{Success: true, IPv4Addr: ipAddr, DeviceNumber: devNum, NetworkPolicyMode: "none"}
+	addrs := []*rpc.IPAddress{&rpc.IPAddress{
+		IPv4Addr:     ipAddr,
+		DeviceNumber: devNum,
+	}}
+	addNetworkReply := &rpc.AddNetworkReply{Success: true, IPAddress: addrs, NetworkPolicyMode: "none"}
 	mockC.EXPECT().AddNetwork(gomock.Any(), gomock.Any()).Return(addNetworkReply, nil)
 
 	v4Addr := &net.IPNet{
-		IP:   net.ParseIP(addNetworkReply.IPv4Addr),
+		IP:   net.ParseIP(addNetworkReply.IPAddress[0].IPv4Addr),
 		Mask: net.IPv4Mask(255, 255, 255, 255),
 	}
 	mocksNetwork.EXPECT().SetupPodNetwork(gomock.Any(), cmdArgs.IfName, cmdArgs.Netns,
-		v4Addr, nil, int(addNetworkReply.DeviceNumber), gomock.Any(), gomock.Any()).Return(nil)
+		v4Addr, nil, int(addNetworkReply.IPAddress[0].DeviceNumber), gomock.Any(), gomock.Any()).Return(nil)
 
 	mocksTypes.EXPECT().PrintResult(gomock.Any(), gomock.Any()).Return(nil).Times(1)
 

cmd/routed-eni-cni-plugin/cni_test.go

@@ -2,9 +2,6 @@
   "cniVersion": "0.4.0",
   "name": "aws-cni",
   "disableCheck": true,
-  "capabilities": {
-    "io.kubernetes.cri.pod-annotations": true
-  },
   "plugins": [
     {
       "name": "aws-cni",
@@ -13,7 +10,8 @@
       "mtu": "__MTU__",
       "podSGEnforcingMode": "__PODSGENFORCINGMODE__",
       "pluginLogFile": "__PLUGINLOGFILE__",
-      "pluginLogLevel": "__PLUGINLOGLEVEL__"
+      "pluginLogLevel": "__PLUGINLOGLEVEL__",
+      "capabilities": {"io.kubernetes.cri.pod-annotations": true}
     },
     {
       "name": "egress-cni",

cmd/routed-eni-cni-plugin/driver/driver.go

@@ -216,11 +216,23 @@ func (s *server) AddNetwork(ctx context.Context, in *rpc.AddNetworkRequest) (*rp
 			}
 		}
 	}
+	// This will be a list of IPs. For now it's just one
+	ipAddrs := []*rpc.IPAddress{}
+
+	// All fields here need to be found from IPAM datastore
+	ipAddr := &rpc.IPAddress{
+		IPv4Addr:     ipv4Addr,
+		IPv6Addr:     ipv6Addr,
+		DeviceNumber: int32(deviceNumber),
+		RouteTableId: int32(deviceNumber),
+		NetworkCard:  0,
+	}
+
+	ipAddrs = append(ipAddrs, ipAddr)
+
 	resp := rpc.AddNetworkReply{
 		Success:           err == nil,
-		IPv4Addr:          ipv4Addr,
-		IPv6Addr:          ipv6Addr,
-		DeviceNumber:      int32(deviceNumber),
+		IPAddress:         ipAddrs,
 		UseExternalSNAT:   useExternalSNAT,
 		VPCv4CIDRs:        pbVPCV4cidrs,
 		VPCv6CIDRs:        pbVPCV6cidrs,
@@ -304,7 +316,8 @@ func (s *server) DelNetwork(ctx context.Context, in *rpc.DelNetworkRequest) (*rp
 			return &rpc.DelNetworkReply{
 				Success:   true,
 				PodVlanId: int32(podENIData[0].VlanID),
-				IPv4Addr:  podENIData[0].PrivateIP}, err
+				IPAddress: []*rpc.IPAddress{&rpc.IPAddress{IPv4Addr: podENIData[0].PrivateIP}},
+			}, err
 		}
 	}
 
@@ -318,7 +331,16 @@ func (s *server) DelNetwork(ctx context.Context, in *rpc.DelNetworkRequest) (*rp
 
 	log.Infof("Send DelNetworkReply: IPv4Addr: %s, IPv6Addr: %s, DeviceNumber: %d, err: %v", ipv4Addr, ipv6Addr, deviceNumber, err)
 
-	return &rpc.DelNetworkReply{Success: err == nil, IPv4Addr: ipv4Addr, IPv6Addr: ipv6Addr, DeviceNumber: int32(deviceNumber)}, err
+	ipAddr := &rpc.IPAddress{
+		IPv4Addr:     ipv4Addr,
+		IPv6Addr:     ipv6Addr,
+		DeviceNumber: int32(deviceNumber),
+	}
+
+	return &rpc.DelNetworkReply{
+		Success:   err == nil,
+		IPAddress: []*rpc.IPAddress{ipAddr},
+	}, err
 }
 
 func (s *server) GetNetworkPolicyConfigs(ctx context.Context, e *emptypb.Empty) (*rpc.NetworkPolicyAgentConfigReply, error) {

misc/10-aws.conflist

@@ -8,7 +8,11 @@ import (
 
 // GeneratePodHostVethName generates the name for Pod's host-side veth device.
 // The veth name is generated in a way that aligns with the value expected by Calico for NetworkPolicy enforcement.
-func GeneratePodHostVethName(prefix string, podNamespace string, podName string) string {
+func GeneratePodHostVethName(prefix string, podNamespace string, podName string, index int) string {
+
+	if index > 0 {
+		podName = fmt.Sprintf("%s.%s", podName, string(index))
+	}
 	suffix := GeneratePodHostVethNameSuffix(podNamespace, podName)
 	return fmt.Sprintf("%s%s", prefix, suffix)
 }
@@ -19,3 +23,11 @@ func GeneratePodHostVethNameSuffix(podNamespace string, podName string) string {
 	h.Write([]byte(fmt.Sprintf("%s.%s", podNamespace, podName)))
 	return hex.EncodeToString(h.Sum(nil))[:11]
 }
+
+// Generates the interface name inside the pod namespace
+func GenerateContainerVethName(defaultIfName string, prefix string, index int) string {
+	if index > 0 {
+		return fmt.Sprintf("%s%s", prefix, string(index))
+	}
+	return defaultIfName
+}

pkg/ipamd/rpc_handler.go

@@ -58,6 +58,9 @@ const (
 	// Rule priority for traffic destined to pod IP
 	ToContainerRulePriority = 512
 
+	// From Interface priority for multi-homed pods
+	FromInterfaceRulePriority = 1
+
 	// 513 - 1023, can be used for priority lower than fromPodRule but higher than default nonVPC CIDR rule
 
 	// 1024 is reserved for (ip rule not to <VPC's subnet> table main)