Merge pull request #1104 from nightmeng/master

Fix a bug of cross-subnet check

Author: caseydavenport

calico_node/filesystem/etc/calico/confd/templates/bird_ipam.cfg.template

@@ -15,7 +15,7 @@ filter calico_ipip {
 {{range ls "/v1/ipam/v4/pool"}}{{$data := json (getv (printf "/v1/ipam/v4/pool/%s" .))}}
   if ( net ~ {{$data.cidr}} ) then {
 {{if $data.ipip_mode}}{{if eq $data.ipip_mode "cross-subnet"}}
-    if ( from ~ {{$network}} ) then
+    if ( bgp_next_hop ~ {{$network}} ) then
       krt_tunnel = "";                     {{/* Destination in ipPool, mode is cross sub-net, route from-host on subnet, do not use IPIP */}}
     else
       krt_tunnel = "{{$data.ipip}}";       {{/* Destination in ipPool, mode is cross sub-net, route from-host off subnet, set the tunnel (if IPIP not enabled, value will be "") */}}