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

gh-726 Overall fixes for Ingress Support #774

Merged
merged 5 commits into from
Aug 26, 2024
Merged

gh-726 Overall fixes for Ingress Support #774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
29a8024
gh-726 Overall fixes
TrekkieCoder Aug 26, 2024
2a8c9f9
Merge branch 'loxilb-io:main' into main
TrekkieCoder Aug 26, 2024
85e31c8
updated to latest loxilib
TrekkieCoder Aug 26, 2024
dd48af8
Merge branch 'main' of https://github.com/TrekkieCoder/loxilb into main
TrekkieCoder Aug 26, 2024
2fba99c
gh-726 Overall fixes
TrekkieCoder Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ require (
github.com/go-openapi/validate v0.22.0
github.com/jessevdk/go-flags v1.5.0
github.com/loxilb-io/ipvs v0.1.0
github.com/loxilb-io/loxilib v0.8.9-0.20240620071157-28d3880edd8f
github.com/loxilb-io/loxilib v0.8.9-0.20240826081440-53bcf7b9aed2
github.com/osrg/gobgp/v3 v3.5.0
github.com/prometheus-community/pro-bing v0.1.0
github.com/prometheus/client_model v0.3.0
Expand Down
4 changes: 4 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,10 @@ github.com/loxilb-io/loxilib v0.8.9-0.20240124072521-f37fbddfb4e8 h1:PYkgIX2fv1U
github.com/loxilb-io/loxilib v0.8.9-0.20240124072521-f37fbddfb4e8/go.mod h1:LoQCxBz+N0fO9rGwRmPHrQPHol/jUf4MNpph63Cydkg=
github.com/loxilb-io/loxilib v0.8.9-0.20240620071157-28d3880edd8f h1:Zeas0eEF60hK+UwMp9QRqPtUuFQV6pC0X2re+yuqCEM=
github.com/loxilb-io/loxilib v0.8.9-0.20240620071157-28d3880edd8f/go.mod h1:LoQCxBz+N0fO9rGwRmPHrQPHol/jUf4MNpph63Cydkg=
github.com/loxilb-io/loxilib v0.8.9-0.20240826070926-6929c7b669f1 h1:6nwOmOypZLqBkm1x5DulX0BEROD04wD9yO/CCOjQWes=
github.com/loxilb-io/loxilib v0.8.9-0.20240826070926-6929c7b669f1/go.mod h1:LoQCxBz+N0fO9rGwRmPHrQPHol/jUf4MNpph63Cydkg=
github.com/loxilb-io/loxilib v0.8.9-0.20240826081440-53bcf7b9aed2 h1:id1unRAYmtM3asSpsE50LZJy7Z6cHjl8gNB4vZHMoQU=
github.com/loxilb-io/loxilib v0.8.9-0.20240826081440-53bcf7b9aed2/go.mod h1:LoQCxBz+N0fO9rGwRmPHrQPHol/jUf4MNpph63Cydkg=
github.com/loxilb-io/sctp v0.0.0-20230519081703-6d1baec82fd4 h1:oDc2lsbfuQEcVP3k+Pw4v6Xdm3t4M9vBc1Y9egszv6g=
github.com/loxilb-io/sctp v0.0.0-20230519081703-6d1baec82fd4/go.mod h1:1a6hv8ISVQhnW5IVpW9o+OL6BAFlWiVpC0O4d19g+wQ=
github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
Expand Down
2 changes: 1 addition & 1 deletion loxilb-ebpf
Open in desktop
Submodule loxilb-ebpf updated 4 files
+50 −10 common/notify.c
+1 −0 common/notify.h
+278 −76 common/sockproxy.c
+1 −0 common/sockproxy.h
4 changes: 4 additions & 0 deletions pkg/loxinet/rules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2255,6 +2255,10 @@ func (R *RuleH) epCheckNow(ep *epHost) {
ep.opts.probeType == HostProbeConnectSCTP {
if ep.opts.probeType == HostProbeConnectTCP {
sType = "tcp"
ret, sIP, _ := R.zone.L3.IfaSelectAny(net.ParseIP(ep.hostName), true)
if ret == 0 {
sHint = sIP.String()
}
} else if ep.opts.probeType == HostProbeConnectUDP {
sType = "udp"
ret, sIP, _ := R.zone.L3.IfaSelectAny(net.ParseIP(ep.hostName), true)
Expand Down
Loading