Merge pull request #781 from JoshVanL/automated-cherry-pick-of-#779-o…

…rigin-release-0.6 Automated cherry pick of #779
jetstack · Mar 15, 2019 · 661025b · 661025b
2 parents 5df7219 + 7e5dd24
commit 661025b
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/pkg/tarmak/ssh/tunnel.go b/pkg/tarmak/ssh/tunnel.go
@@ -57,6 +57,7 @@ func (s *SSH) Tunnel(dest, destPort, localPort string, daemonize bool) interface
 		destPort:  destPort,
 		daemonize: daemonize,
 		localPort: localPort,
+		doneCh:    make(chan struct{}),
 	}
 
 	s.tunnels = append(s.tunnels, tunnel)
@@ -213,7 +214,12 @@ func (t *Tunnel) handleTimeout() {
 	t.connsLock.Unlock()
 
 	t.cleanup()
-	close(t.doneCh)
+
+	select {
+	case <-t.doneCh:
+	default:
+		close(t.doneCh)
+	}
 }
 
 func (t *Tunnel) Done() <-chan struct{} {