Merge pull request #3158 from mboersma/cherry-pick-3153-release-1.6

[release-1.6] Add 30s timeout to test helper SSH config

test/e2e/helpers.go

@@ -75,6 +75,7 @@ const (
 	deleteOperationTimeout                = 20 * time.Minute
 	retryableOperationTimeout             = 30 * time.Second
 	retryableOperationSleepBetweenRetries = 3 * time.Second
+	sshConnectionTimeout                  = 30 * time.Second
 )
 
 // deploymentsClientAdapter adapts a Deployment to work with WaitForDeploymentsAvailable.
@@ -533,6 +534,7 @@ func newSSHConfig() (*ssh.ClientConfig, error) {
 		HostKeyCallback: ssh.InsecureIgnoreHostKey(), //nolint:gosec // Non-production code
 		User:            azure.DefaultUserName,
 		Auth:            []ssh.AuthMethod{pubkey},
+		Timeout:         sshConnectionTimeout,
 	}
 	return &sshConfig, nil
 }