|
|
@ -258,11 +258,14 @@ authLoop:
|
|
|
|
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 != "" {
|
|
|
|
|
|
|
|
// Remove any serve config that may have been set by a previous run of
|
|
|
|
|
|
|
|
// containerboot, but only if we're providing a new one.
|
|
|
|
if err := client.SetServeConfig(ctx, new(ipn.ServeConfig)); err != nil {
|
|
|
|
if err := client.SetServeConfig(ctx, new(ipn.ServeConfig)); err != nil {
|
|
|
|
log.Fatalf("failed to unset serve config: %v", err)
|
|
|
|
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 {
|
|
|
|
// We were told to only auth once, so any secret-bound
|
|
|
|
// We were told to only auth once, so any secret-bound
|
|
|
|