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

k8s-ci-robot · web-flow · commit b826d394af56 · 2020-07-24T09:26:22.000-07:00
Allow integration test servers extra time to start
diff --git a/cmd/kube-apiserver/app/testing/testserver.go b/cmd/kube-apiserver/app/testing/testserver.go
@@ -205,7 +205,7 @@ func StartTestServer(t Logger, instanceOptions *TestServerInstanceOptions, custo
 	}
 
 	// 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 {
 		case err := <-errCh:
 			return false, err
diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server/testing/testserver.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server/testing/testserver.go
@@ -164,7 +164,7 @@ func StartTestServer(t Logger, instanceOptions *TestServerInstanceOptions, custo
 	if err != nil {
 		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 {
 		case err := <-errCh:
 			return false, err

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ func StartTestServer(t Logger, instanceOptions *TestServerInstanceOptions, custo`
`205`	`205`	`}`
`206`	`206`
`207`	`207`	`// wait until healthz endpoint returns ok`
`208`		`- err = wait.Poll(100time.Millisecond, 30time.Second, func() (bool, error) {`
	`208`	`+ err = wait.Poll(100*time.Millisecond, time.Minute, func() (bool, error) {`
`209`	`209`	`select {`
`210`	`210`	`case err := <-errCh:`
`211`	`211`	`return false, err`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ func StartTestServer(t Logger, instanceOptions *TestServerInstanceOptions, custo`
`164`	`164`	`if err != nil {`
`165`	`165`	`return result, fmt.Errorf("failed to create a client: %v", err)`
`166`	`166`	`}`
`167`		`- err = wait.Poll(100time.Millisecond, 30time.Second, func() (bool, error) {`
	`167`	`+ err = wait.Poll(100*time.Millisecond, time.Minute, func() (bool, error) {`
`168`	`168`	`select {`
`169`	`169`	`case err := <-errCh:`
`170`	`170`	`return false, err`