github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ensure we delete orphaned routes with matching next-hops only 

There might be a valid route with the same DestinationCIDR pointing to a running node.
pull/8/head
Fabian Ruff 2018-04-18 13:15:41 +02:00
parent de15b859ba
commit 65d4147139
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/cloudprovider/providers/openstack/openstack_routes.go
View File

@ -83,9 +83,12 @@ func (r *Routes) ListRoutes(ctx context.Context, clusterName string) ([]*cloudpr
var routes []*cloudprovider.Route var routes []*cloudprovider.Route
for _, item := range router.Routes { for _, item := range router.Routes {
nodeName, foundNode := nodeNamesByAddr[item.NextHop] nodeName, foundNode := nodeNamesByAddr[item.NextHop]
if !foundNode {
nodeName = types.NodeName(item.NextHop)
}
route := cloudprovider.Route{ route := cloudprovider.Route{
Name: item.DestinationCIDR, Name: item.DestinationCIDR,
TargetNode: nodeName, //empty if NextHop is unknown TargetNode: nodeName, //contains the nexthop address if node was not found
Blackhole: !foundNode, Blackhole: !foundNode,
DestinationCIDR: item.DestinationCIDR, DestinationCIDR: item.DestinationCIDR,
} }
@ -228,7 +231,7 @@ func (r *Routes) DeleteRoute(ctx context.Context, clusterName string, route *clo
var addr string var addr string
// Blackhole routes are orphaned and have no target in OpenStack // Blackhole routes are orphaned and have no counterpart in OpenStack
if !route.Blackhole { if !route.Blackhole {
var err error var err error
addr, err = getAddressByName(r.compute, route.TargetNode, isCIDRv6) addr, err = getAddressByName(r.compute, route.TargetNode, isCIDRv6)
@ -245,7 +248,7 @@ func (r *Routes) DeleteRoute(ctx context.Context, clusterName string, route *clo
routes := router.Routes routes := router.Routes
index := -1 index := -1
for i, item := range routes { for i, item := range routes {
if item.DestinationCIDR == route.DestinationCIDR && (route.Blackhole || item.NextHop == addr) { if item.DestinationCIDR == route.DestinationCIDR && (item.NextHop == addr || route.Blackhole && item.NextHop == string(route.TargetNode)) {
index = i index = i
break break
} }