Merge pull request #523 from monder/endpoints

aws-vpc: Fix crash when route has vpc-endpoints
flannel-io · Oct 25, 2016 · 2fc9397 · 2fc9397
2 parents f2bf330 + 94e4963
commit 2fc9397
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/backend/awsvpc/awsvpc.go b/backend/awsvpc/awsvpc.go
@@ -192,7 +192,7 @@ func (be *AwsVpcBackend) checkMatchingRoutes(routeTableID, instanceID, subnet st
 
 	for _, routeTable := range resp.RouteTables {
 		for _, route := range routeTable.Routes {
-			if subnet == *route.DestinationCidrBlock && *route.State == "active" {
+			if route.DestinationCidrBlock != nil && subnet == *route.DestinationCidrBlock && *route.State == "active" {
 
 				if *route.InstanceId == instanceID {
 					matchingRouteFound = true