Skip to content

Commit

Permalink
daemon: Fix build after VTEP routes conflict
Browse files Browse the repository at this point in the history
Commit f77456d ("vtep: VTEP policy routing setup when L7 policy
enabled") was recently merged without rebasing on top of master, which
introduced a compile-time conflict vs commit 8906f2b
("datapath/linux/route: remove unused Upsert bool return value"). Fix it
by updating the Upsert() call.

CC: Vincent Li <v.li@f5.com>
Fixes: f77456d ("vtep: VTEP policy routing setup when L7 policy enabled")
Signed-off-by: Joe Stringer <joe@cilium.io>
  • Loading branch information
joestringer authored and aanm committed Jun 3, 2022
1 parent 4189d1c commit a511213
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion daemon/cmd/datapath.go
Expand Up @@ -555,7 +555,7 @@ func setupRouteToVtepCidr() error {
MTU: vtepMTU,
Table: linux_defaults.RouteTableVtep,
}
if _, err := route.Upsert(r); err != nil {
if err := route.Upsert(r); err != nil {
return fmt.Errorf("Update VTEP CIDR route error: %w", err)
}
log.WithFields(logrus.Fields{
Expand Down

0 comments on commit a511213

Please sign in to comment.