Mirrors/juanfont.headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2025-09-06 17:54:31 +02:00
Code Issues Projects Releases Wiki Activity

save routes on register

Browse Source 
Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
Kristoffer Dalby 2025-02-23 19:27:52 +01:00
parent fec8d831d8
commit 7b06ba3dc4
No known key found for this signature in database
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hscontrol/db/node.go
View File

@ -453,6 +453,10 @@ func RegisterNode(tx *gorm.DB, node types.Node, ipv4 *netip.Addr, ipv6 *netip.Ad
return nil, fmt.Errorf("failed register(save) node in the database: %w", err) return nil, fmt.Errorf("failed register(save) node in the database: %w", err)
} }
if _, err := SaveNodeRoutes(tx, &node); err != nil {
return nil, fmt.Errorf("failed to save node routes: %w", err)
}
log.Trace(). log.Trace().
Caller(). Caller().
Str("node", node.Hostname). Str("node", node.Hostname).

17
integration/tsic/tsic.go
View File

@ -80,6 +80,7 @@ type TailscaleInContainer struct {
withExtraHosts []string withExtraHosts []string
workdir string workdir string
netfilter string netfilter string
extraLoginArgs []string
// build options, solely for HEAD // build options, solely for HEAD
buildConfig TailscaleInContainerBuildConfig buildConfig TailscaleInContainerBuildConfig
@ -203,6 +204,14 @@ func WithBuildTag(tag string) Option {
} }
} }
// WithExtraLoginArgs adds additional arguments to the `tailscale up` command
// as part of the Login function.
func WithExtraLoginArgs(args []string) Option {
return func(tsic *TailscaleInContainer) {
tsic.extraLoginArgs = args
}
}
// New returns a new TailscaleInContainer instance. // New returns a new TailscaleInContainer instance.
func New( func New(
pool *dockertest.Pool, pool *dockertest.Pool,
@ -436,6 +445,10 @@ func (t *TailscaleInContainer) Login(
"--accept-routes=false", "--accept-routes=false",
} }
if t.extraLoginArgs != nil {
command = append(command, t.extraLoginArgs...)
}
if t.withSSH { if t.withSSH {
command = append(command, "--ssh") command = append(command, "--ssh")
} }
@ -475,6 +488,10 @@ func (t *TailscaleInContainer) LoginWithURL(
"--accept-routes=false", "--accept-routes=false",
} }
if t.extraLoginArgs != nil {
command = append(command, t.extraLoginArgs...)
}
stdout, stderr, err := t.Execute(command) stdout, stderr, err := t.Execute(command)
if errors.Is(err, errTailscaleNotLoggedIn) { if errors.Is(err, errTailscaleNotLoggedIn) {
return nil, errTailscaleCannotUpWithoutAuthkey return nil, errTailscaleCannotUpWithoutAuthkey