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.

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

Border router restructure #4351

Merged
merged 25 commits into from
Jul 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions router/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,14 @@ go_library(
"@com_github_google_gopacket//layers:go_default_library",
"@com_github_prometheus_client_golang//prometheus:go_default_library",
"@com_github_prometheus_client_golang//prometheus/promauto:go_default_library",
"@org_golang_x_net//ipv4:go_default_library",
],
)

go_test(
name = "go_default_test",
srcs = [
"dataplane_internal_test.go",
"dataplane_test.go",
"export_test.go",
"svc_test.go",
Expand All @@ -48,6 +50,7 @@ go_test(
deps = [
"//pkg/addr:go_default_library",
"//pkg/experimental/epic:go_default_library",
"//pkg/private/serrors:go_default_library",
"//pkg/private/util:go_default_library",
"//pkg/private/xtest:go_default_library",
"//pkg/scrypto:go_default_library",
Expand Down
4 changes: 3 additions & 1 deletion router/cmd/router/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,9 @@ func realMain(ctx context.Context) error {
})
g.Go(func() error {
defer log.HandlePanic()
if err := dp.DataPlane.Run(errCtx); err != nil {
runConfig := &router.RunConfig{}
runConfig.LoadDefaults()
if err := dp.DataPlane.Run(errCtx, runConfig); err != nil {
return serrors.WrapStr("running dataplane", err)
}
return nil
Expand Down
Loading
Loading