Merge pull request #3157 from mboersma/cherry-pick-3153-release-1.7

k8s-ci-robot · web-flow · commit 42e3d6173ac2 · 2023-02-08T12:06:43.000-08:00
[release-1.7] Add 30s timeout to test helper SSH config
diff --git a/test/e2e/helpers.go b/test/e2e/helpers.go
@@ -78,6 +78,7 @@ const (
 	retryableOperationTimeout             = 30 * time.Second
 	retryableDeleteOperationTimeout       = 3 * time.Minute
 	retryableOperationSleepBetweenRetries = 3 * time.Second
+	sshConnectionTimeout                  = 30 * time.Second
 )
 
 // deploymentsClientAdapter adapts a Deployment to work with WaitForDeploymentsAvailable.
@@ -587,6 +588,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
 }

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,7 @@ const (`
`78`	`78`	`retryableOperationTimeout = 30 * time.Second`
`79`	`79`	`retryableDeleteOperationTimeout = 3 * time.Minute`
`80`	`80`	`retryableOperationSleepBetweenRetries = 3 * time.Second`
	`81`	`+ sshConnectionTimeout = 30 * time.Second`
`81`	`82`	`)`
`82`	`83`
`83`	`84`	`// deploymentsClientAdapter adapts a Deployment to work with WaitForDeploymentsAvailable.`
`@@ -587,6 +588,7 @@ func newSSHConfig() (*ssh.ClientConfig, error) {`
`587`	`588`	`HostKeyCallback: ssh.InsecureIgnoreHostKey(), //nolint:gosec // Non-production code`
`588`	`589`	`User: azure.DefaultUserName,`
`589`	`590`	`Auth: []ssh.AuthMethod{pubkey},`
	`591`	`+ Timeout: sshConnectionTimeout,`
`590`	`592`	`}`
`591`	`593`	`return &sshConfig, nil`
`592`	`594`	`}`