Skip to content

K
k3s
Commit 33012c03 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #43421 from bizhao/master

Automatic merge from submit-queue (batch tested with PRs 43429, 43416, 43312, 43141, 43421) Make e2e-dns test more stable by increasing wait time **What this PR does / why we need it**: In many cases, 60 seconds are not enough for generating all dns results. Since the probeCmd takes up to 600 seconds, use 600 here too. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #43264, #43094, #43100 **Special notes for your reviewer**: **Release note**: NONE
parents 484ac692 3b98c808
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
test/e2e/dns.go
View file @ 33012c03
...@@ -179,7 +179,7 @@ func assertFilesExist(fileNames []string, fileDir string, pod *v1.Pod, client cl ...@@ -179,7 +179,7 @@ func assertFilesExist(fileNames []string, fileDir string, pod *v1.Pod, client cl
func assertFilesContain(fileNames []string, fileDir string, pod *v1.Pod, client clientset.Interface, check bool, expected string) { func assertFilesContain(fileNames []string, fileDir string, pod *v1.Pod, client clientset.Interface, check bool, expected string) {
var failed []string var failed []string
framework.ExpectNoError(wait.Poll(time.Second*2, time.Second*60, func() (bool, error) { framework.ExpectNoError(wait.Poll(time.Second*10, time.Second*600, func() (bool, error) {
failed = []string{} failed = []string{}
subResourceProxyAvailable, err := framework.ServerVersionGTE(framework.SubResourcePodProxyVersion, client.Discovery()) subResourceProxyAvailable, err := framework.ServerVersionGTE(framework.SubResourcePodProxyVersion, client.Discovery())
if err != nil { if err != nil {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment