Merge pull request #20601 from squeed/sdn-route-exists

openshift-merge-robot · web-flow · commit e5682f154097 · 2018-08-14T12:37:46.000-07:00
sdn: don't fail when adding a duplicate route
diff --git a/cmd/sdn-cni-plugin/openshift-sdn_linux.go b/cmd/sdn-cni-plugin/openshift-sdn_linux.go
@@ -228,7 +228,7 @@ func (p *cniPlugin) CmdAdd(args *skel.CmdArgs) error {
 					Dst: dst,
 					Gw:  defaultGW,
 				}
-				if err := netlink.RouteAdd(route); err != nil {
+				if err := netlink.RouteAdd(route); err != nil && !os.IsExist(err) {
 					return fmt.Errorf("failed to add route to dst: %v via SDN: %v", dst, err)
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ func (p cniPlugin) CmdAdd(args skel.CmdArgs) error {`
`228`	`228`	`Dst: dst,`
`229`	`229`	`Gw: defaultGW,`
`230`	`230`	`}`
`231`		`- if err := netlink.RouteAdd(route); err != nil {`
	`231`	`+ if err := netlink.RouteAdd(route); err != nil && !os.IsExist(err) {`
`232`	`232`	`return fmt.Errorf("failed to add route to dst: %v via SDN: %v", dst, err)`
`233`	`233`	`}`
`234`	`234`	`}`