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

added geneve proxy xgress #504

Closed
wants to merge 10 commits into from
Closed

added geneve proxy xgress #504

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7986a97
added geneve proxy xgress
dariuszSki Oct 8, 2021
cf6de74
update edge dep, update change log for timeoutRemaining bug
andrewpmartinez Oct 11, 2021
7d6dafc
Merge pull request #506 from openziti/edge.timeout.remaining.bug
andrewpmartinez Oct 12, 2021
705ca96
Update deps/changelog. Add traceroute command to ziti edge CLI
plorenz Oct 8, 2021
ea00908
Merge pull request #505 from openziti/traceroute
plorenz Oct 12, 2021
cab126f
updated mod and changelog
dariuszSki Oct 13, 2021
e364c73
updated mod and changelog
dariuszSki Oct 13, 2021
926e3ff
added geneve proxy xgress
dariuszSki Oct 8, 2021
6783ad1
updated mod and changelog
dariuszSki Oct 13, 2021
79a3f64
Merge branch 'feature/geneve' of github.com:dariuszSki/ziti into feat…
dariuszSki Oct 13, 2021
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
Prev Previous commit
Next Next commit
added geneve proxy xgress
  • Loading branch information
@dariuszSki
dariuszSki committed Oct 13, 2021
commit 926e3ff9fbca3c730508188c0683b417c46433aa
12 changes: 8 additions & 4 deletions ziti-router/subcmd/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,19 @@ package subcmd

import (
"fmt"
"io"
"os"
"os/signal"
"syscall"

"github.com/michaelquigley/pfxlog"
"github.com/openziti/edge/edge_common"
"github.com/openziti/edge/router/debugops"
"github.com/openziti/edge/router/fabric"
"github.com/openziti/edge/router/xgress_edge"
"github.com/openziti/edge/router/xgress_edge_transport"
"github.com/openziti/edge/router/xgress_edge_tunnel"
"github.com/openziti/edge/router/xgress_geneve"
"github.com/openziti/fabric/router"
"github.com/openziti/fabric/router/xgress"
"github.com/openziti/foundation/agent"
Expand All @@ -33,10 +39,6 @@ import (
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"io"
"os"
"os/signal"
"syscall"
)

var forceEnrollmentExtension *bool
Expand Down Expand Up @@ -87,6 +89,8 @@ func run(cmd *cobra.Command, args []string) {
logrus.Panicf("error registering edge tunnel in framework (%v)", err)
}

xgress.GlobalRegistry().Register("geneve", xgress_geneve.Factory{})

if cliAgentEnabled {
options := agent.Options{Addr: cliAgentAddr}
if debugOpsEnabled {
Expand Down