Commit 26340cd
committed
Fix default route replacement
Multus was failing to detect existing Default routes in container and
remove them before replacement, which causes later adding of default
route to fail with EEXIST, which is ignored and not detected as a error.
This leads to container keeping existing default route in case of
chained CNIs instead of getting new default route from Multus.
Fixes regression introduced by f18d96b
There was a breaking change in that bump:
vishvananda/netlink@acdc658
route.Dst is a zero IPNet instead of nil
Check for default route using isIPNetZero adopted from
github.com/containernetworking/plugins/pkg/ip.IsIPNetZero. Avoid
importing ip.IsIPNetZero to avoid brining more dependencies.
Signed-off-by: Viktor Oreshkin <imselfish@stek29.rocks>1 parent f688790 commit 26340cd
2 files changed
Lines changed: 34 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
33 | 43 | | |
34 | 44 | | |
35 | 45 | | |
| |||
43 | 53 | | |
44 | 54 | | |
45 | 55 | | |
46 | | - | |
| 56 | + | |
47 | 57 | | |
48 | 58 | | |
49 | 59 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
43 | 54 | | |
44 | 55 | | |
45 | 56 | | |
| |||
234 | 245 | | |
235 | 246 | | |
236 | 247 | | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
237 | 260 | | |
238 | 261 | | |
239 | 262 | | |
| |||
0 commit comments