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

Allow setting of registration url via env variable #139

Merged
merged 3 commits into from
Aug 28, 2023
Merged

Allow setting of registration url via env variable #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8eda54a
Use env variable NSM_REGISTER_AS_URL for NSE registration
bellycat77 Aug 25, 2023
b5b53fe
Fix linting errors
bellycat77 Aug 25, 2023
28645b1
Address review comment
bellycat77 Aug 28, 2023
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
1 change: 0 additions & 1 deletion internal/imports/imports_linux.go
View file
Open in desktop

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

12 changes: 9 additions & 3 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ import (
"github.com/networkservicemesh/sdk/pkg/networkservice/common/authorize"
"github.com/networkservicemesh/sdk/pkg/networkservice/common/mechanisms"
kernel_sdk "github.com/networkservicemesh/sdk/pkg/networkservice/common/mechanisms/kernel"
"github.com/networkservicemesh/sdk/pkg/networkservice/common/mechanisms/sendfd"
"github.com/networkservicemesh/sdk/pkg/networkservice/common/retry"
"github.com/networkservicemesh/sdk/pkg/networkservice/connectioncontext/ipcontext/vl3"
"github.com/networkservicemesh/sdk/pkg/networkservice/core/adapters"
Expand Down Expand Up @@ -103,6 +102,7 @@ type Config struct {
RegistryClientPolicies []string `default:"etc/nsm/opa/common/.*.rego,etc/nsm/opa/registry/.*.rego,etc/nsm/opa/client/.*.rego" desc:"paths to files and directories that contain registry client policies" split_words:"true"`
ServiceNames []string `default:"docker-vl3" desc:"Name of providing service" split_words:"true"`
RegisterService bool `default:"true" desc:"if true then registers network service on startup" split_words:"true"`
RegisterAsURL url.URL `default:"" desc:"Endpoint URL" split_words:"true"`
Labels map[string]string `default:"" desc:"Endpoint labels"`
TunnelIP net.IP `desc:"IP to use for tunnels" split_words:"true"`
Vl3Prefix string `default:"169.254.0.0/16" desc:"vl3 prefix"`
Expand Down Expand Up @@ -340,11 +340,18 @@ func main() {
}
}

var RegisterAsURL *url.URL
if config.RegisterAsURL.Scheme == "" {
RegisterAsURL = listenOn
} else {
RegisterAsURL = &config.RegisterAsURL
}

nseRegistration := &registryapi.NetworkServiceEndpoint{
Name: config.Name,
NetworkServiceNames: config.ServiceNames,
NetworkServiceLabels: make(map[string]*registryapi.NetworkServiceLabels),
Url: listenOn.String(),
Url: RegisterAsURL.String(),
denis-tingaikin marked this conversation as resolved.
Show resolved Hide resolved
}
for _, serviceName := range config.ServiceNames {
nseRegistration.NetworkServiceLabels[serviceName] = &registryapi.NetworkServiceLabels{Labels: config.Labels}
Expand Down Expand Up @@ -375,7 +382,6 @@ func createVl3Endpoint(ctx context.Context, config *Config, vppConn vpphelper.Co
unnumbered.NewServer(vppConn, loopback.Load),
vrf.NewServer(vppConn, vrf.WithLoadInterface(loopback.Load)),
loopback.NewServer(vppConn),
sendfd.NewServer(),
up.NewServer(ctx, vppConn),
mtu.NewServer(vppConn),
routes.NewServer(vppConn),
Expand Down
Loading