Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ipvlan support kube-proxy's ipvs mode #76

Merged
merged 2 commits into from
Dec 9, 2019
Merged

ipvlan support kube-proxy's ipvs mode #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96ee27c
vendor: update vishvananda/netlink to support tunnel-key
Dec 1, 2019
7376277
plugin/ipvlan: unset the route before tc redirect
zhiyuan0x Dec 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
233 changes: 128 additions & 105 deletions Gopkg.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@

[[constraint]]
name = "github.com/vishvananda/netlink"
version = "1.0.0"
branch = "master"

[[constraint]]
name = "k8s.io/apimachinery"
Expand Down
10 changes: 7 additions & 3 deletions plugin/driver/ipvlan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,8 +358,11 @@ func (rule *redirectRule) isMatch(filter netlink.Filter) bool {
}

func (rule *redirectRule) toU32Filter() *netlink.U32 {
act := netlink.NewMirredAction(rule.dstIndex)
act.MirredAction = netlink.TCA_INGRESS_REDIR
mirredAct := netlink.NewMirredAction(rule.dstIndex)
mirredAct.MirredAction = netlink.TCA_INGRESS_REDIR

tunAct := netlink.NewTunnelKeyAction()
tunAct.Action = netlink.TCA_TUNNEL_KEY_UNSET

return &netlink.U32{
FilterAttrs: netlink.FilterAttrs{
Expand All @@ -379,7 +382,8 @@ func (rule *redirectRule) toU32Filter() *netlink.U32 {
},
},
Actions: []netlink.Action{
act,
tunAct,
mirredAct,
},
}
}
Expand Down
18 changes: 17 additions & 1 deletion vendor/github.com/Microsoft/go-winio/file.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions vendor/github.com/Microsoft/go-winio/go.mod
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions vendor/github.com/Microsoft/go-winio/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading