TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 04:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/containerboot: only wipeout serve config when TS_SERVE_CONFIG is set

Browse Source 
Fixes #9558

Signed-off-by: Maisem Ali <maisem@tailscale.com>
This commit is contained in:
Maisem Ali 2023-09-29 09:08:49 -07:00 committed by Maisem Ali
parent 246e0ccdca
commit d71184d674
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/containerboot/main.go
View File

@ -258,10 +258,13 @@ func main() {
if err := tailscaleSet(ctx, cfg); err != nil { if err := tailscaleSet(ctx, cfg); err != nil {
log.Fatalf("failed to auth tailscale: %v", err) log.Fatalf("failed to auth tailscale: %v", err)
} }
// Remove any serve config that may have been set by a previous
// run of containerboot. if cfg.ServeConfigPath != "" {
if err := client.SetServeConfig(ctx, new(ipn.ServeConfig)); err != nil { // Remove any serve config that may have been set by a previous run of
log.Fatalf("failed to unset serve config: %v", err) // containerboot, but only if we're providing a new one.
if err := client.SetServeConfig(ctx, new(ipn.ServeConfig)); err != nil {
log.Fatalf("failed to unset serve config: %v", err)
}
} }
if cfg.InKubernetes && cfg.KubeSecret != "" && cfg.KubernetesCanPatch && cfg.AuthOnce { if cfg.InKubernetes && cfg.KubeSecret != "" && cfg.KubernetesCanPatch && cfg.AuthOnce {