Merge pull request #750 from ironlung975/vxlan-check-gbp

Added compatibility check to compare GBP for VXLAN
flannel-io · Jun 16, 2017 · cbc06a5 · cbc06a5
2 parents dec0c1f + c5b207f
commit cbc06a5
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/backend/vxlan/device.go b/backend/vxlan/device.go
@@ -291,6 +291,10 @@ func vxlanLinksIncompat(l1, l2 netlink.Link) string {
 		return fmt.Sprintf("port: %v vs %v", v1.Port, v2.Port)
 	}
 
+	if v1.GBP != v2.GBP {
+		return fmt.Sprintf("gbp: %v vs %v", v1.GBP, v2.GBP)
+	}
+
 	return ""
 }