ipam: use ip provided by nad annotation when providing IPAM for other…

… CNI plugins (#4883)

Signed-off-by: zhangzujian <[email protected]>

pkg/controller/pod.go

@@ -1560,13 +1560,9 @@ func (c *Controller) getPodAttachmentNet(pod *v1.Pod) ([]*kubeovnNet, error) {
 				Subnet:             subnet,
 				IsDefault:          isDefault,
 				AllowLiveMigration: allowLiveMigration,
+				MacRequest:         attach.MacRequest,
+				IPRequest:          strings.Join(attach.IPRequest, ","),
 			}
-
-			if len(attach.IPRequest) != 0 {
-				ret.IPRequest = strings.Join(attach.IPRequest, ",")
-			}
-
-			ret.MacRequest = attach.MacRequest
 			result = append(result, ret)
 		} else {
 			providerName = fmt.Sprintf("%s.%s", attach.Name, attach.Namespace)
@@ -1576,6 +1572,8 @@ func (c *Controller) getPodAttachmentNet(pod *v1.Pod) ([]*kubeovnNet, error) {
 						Type:         providerTypeIPAM,
 						ProviderName: providerName,
 						Subnet:       subnet,
+						MacRequest:   attach.MacRequest,
+						IPRequest:    strings.Join(attach.IPRequest, ","),
 					})
 					break
 				}