TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-01-07 08:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

containerboot: Add TS_ACCEPT_ROUTES (#10176)

Browse Source 
Fixes tailscale/corp#15596

Signed-off-by: Claire Wang <claire@tailscale.com>
This commit is contained in:
Claire Wang 2023-11-22 11:45:44 -05:00 committed by GitHub
parent 128d3ad1a9
commit afacf2e368
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/containerboot/main.go
View File

@ -13,7 +13,7 @@
// //
// - TS_AUTHKEY: the authkey to use for login. // - TS_AUTHKEY: the authkey to use for login.
// - TS_HOSTNAME: the hostname to request for the node. // - TS_HOSTNAME: the hostname to request for the node.
// - TS_ROUTES: subnet routes to advertise. // - TS_ROUTES: subnet routes to advertise. To accept routes, use TS_EXTRA_ARGS to pass in --accept-routes.
// - TS_DEST_IP: proxy all incoming Tailscale traffic to the given // - TS_DEST_IP: proxy all incoming Tailscale traffic to the given
// destination. // destination.
// - TS_TAILNET_TARGET_IP: proxy all incoming non-Tailscale traffic to the given // - TS_TAILNET_TARGET_IP: proxy all incoming non-Tailscale traffic to the given

16
cmd/containerboot/main_test.go
View File

@ -575,6 +575,22 @@ type phase struct {
}, },
}, },
}, },
{
Name: "extra_args_accept_routes",
Env: map[string]string{
"TS_EXTRA_ARGS": "--accept-routes",
},
Phases: []phase{
{
WantCmds: []string{
"/usr/bin/tailscaled --socket=/tmp/tailscaled.sock --state=mem: --statedir=/tmp --tun=userspace-networking",
"/usr/bin/tailscale --socket=/tmp/tailscaled.sock up --accept-dns=false --accept-routes",
},
}, {
Notify: runningNotify,
},
},
},
{ {
Name: "hostname", Name: "hostname",
Env: map[string]string{ Env: map[string]string{