github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #93398 from liggitt/apiserver-integration-startup

Browse Source 
Allow integration test servers extra time to start
This commit is contained in:
Kubernetes Prow Robot 2020-07-24 09:26:22 -07:00 committed by GitHub
commit b826d394af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kube-apiserver/app/testing/testserver.go
View File

@ -205,7 +205,7 @@ func StartTestServer(t Logger, instanceOptions *TestServerInstanceOptions, custo
} }
// wait until healthz endpoint returns ok // wait until healthz endpoint returns ok
err = wait.Poll(100*time.Millisecond, 30*time.Second, func() (bool, error) { err = wait.Poll(100*time.Millisecond, time.Minute, func() (bool, error) {
select { select {
case err := <-errCh: case err := <-errCh:
return false, err return false, err

2
staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server/testing/testserver.go
View File

@ -164,7 +164,7 @@ func StartTestServer(t Logger, instanceOptions *TestServerInstanceOptions, custo
if err != nil { if err != nil {
return result, fmt.Errorf("failed to create a client: %v", err) return result, fmt.Errorf("failed to create a client: %v", err)
} }
err = wait.Poll(100*time.Millisecond, 30*time.Second, func() (bool, error) { err = wait.Poll(100*time.Millisecond, time.Minute, func() (bool, error) {
select { select {
case err := <-errCh: case err := <-errCh:
return false, err return false, err