kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Can only request agent forwarding once per connection

This commit is contained in:
John Gardiner Myers 2022-11-10 22:42:23 -08:00
parent 29510977de
commit 6bd629e9c7
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/dump/dumper.go
View File

@ -198,7 +198,7 @@ func (d *logDumper) dumpNode(ctx context.Context, name string, ip string, useBas
n, err := d.connectToNode(ctx, name, ip, useBastion)
if err != nil {
return fmt.Errorf("could not connect: %v", err)
return fmt.Errorf("connecting: %w", err)
}
// As long as we connect to the node we will not return an error;
@ -414,12 +414,6 @@ func (s *sshClientImplementation) ExecPiped(ctx context.Context, cmd string, std
session.Stderr = stderr
if s.forwardTo != "" {
err = agent.RequestAgentForwarding(session)
if err != nil {
finished <- fmt.Errorf("requesting agent forwarding: %w", err)
return
}
cmd = fmt.Sprintf("ssh -o 'StrictHostKeyChecking no' %s %s", quoteShell(s.forwardTo), quoteShell(cmd))
}
@ -508,6 +502,22 @@ func (f *sshClientFactoryImplementation) Dial(ctx context.Context, host string,
}
}
}
if err == nil && useBastion {
session, err := client.NewSession()
if err != nil {
finished <- fmt.Errorf("creating ssh session: %w", err)
return
}
defer session.Close()
err = agent.RequestAgentForwarding(session)
if err != nil {
finished <- fmt.Errorf("requesting agent forwarding: %w", err)
return
}
}
finished <- err
}()