Mirror/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2024-06-07 19:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add context to tunnel connect

Browse Source
This commit is contained in:
Erik Wilson 2019-07-17 18:15:15 -07:00
parent b93b4732eb
commit 23b0797578
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/agent/run.go
View File

@ -47,7 +47,7 @@ func run(ctx context.Context, cfg cmds.Agent) error {
return err
}
if err := tunnel.Setup(nodeConfig); err != nil {
if err := tunnel.Setup(ctx, nodeConfig); err != nil {
return err
}

15
pkg/agent/tunnel/tunnel.go
View File

@ -52,7 +52,7 @@ func getAddresses(endpoint *v1.Endpoints) []string {
return serverAddresses
}
func Setup(config *config.Node) error {
func Setup(ctx context.Context, config *config.Node) error {
restConfig, err := clientcmd.BuildConfigFromFlags("", config.AgentConfig.KubeConfigNode)
if err != nil {
return err
@ -133,7 +133,18 @@ func Setup(config *config.Node) error {
}
}()
wg.Wait()
wait := make(chan int, 1)
go func() {
wg.Wait()
wait <- 0
}()
select {
case <-ctx.Done():
logrus.Error("tunnel context canceled while waiting for connection")
return ctx.Err()
case <-wait:
}
return nil
}