TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-18 02:48:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/k8s-operator: fix regression from earlier refactor

Browse Source 
I forgot to move the defer out of the func, so the tsnet.Server
immediately closed after starting.

Updates #502

Signed-off-by: Maisem Ali <maisem@tailscale.com>
This commit is contained in:
Maisem Ali 2023-08-23 14:39:33 -04:00 committed by Maisem Ali
parent 9089efea06
commit 74388a771f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/k8s-operator/operator.go
View File

@ -65,6 +65,7 @@ func main() {
logf.SetLogger(zapr.NewLogger(zlog.Desugar())) logf.SetLogger(zapr.NewLogger(zlog.Desugar()))
s, tsClient := initTSNet(zlog) s, tsClient := initTSNet(zlog)
defer s.Close()
restConfig := config.GetConfigOrDie() restConfig := config.GetConfigOrDie()
if shouldRunAuthProxy { if shouldRunAuthProxy {
launchAuthProxy(zlog, restConfig, s) launchAuthProxy(zlog, restConfig, s)
@ -118,7 +119,6 @@ func initTSNet(zlog *zap.SugaredLogger) (*tsnet.Server, *tailscale.Client) {
if err := s.Start(); err != nil { if err := s.Start(); err != nil {
startlog.Fatalf("starting tailscale server: %v", err) startlog.Fatalf("starting tailscale server: %v", err)
} }
defer s.Close()
lc, err := s.LocalClient() lc, err := s.LocalClient()
if err != nil { if err != nil {
startlog.Fatalf("getting local client: %v", err) startlog.Fatalf("getting local client: %v", err)