github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #102533 from aojea/lb_flakes

Browse Source 
Lb flakes
This commit is contained in:
Kubernetes Prow Robot 2021-06-03 20:53:38 -07:00 committed by GitHub
commit 271f54632b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/framework/network/utils.go
View File

@ -900,7 +900,7 @@ func (config *NetworkingTestConfig) getServiceClient() coreclientset.ServiceInte
// HTTPPokeParams is a struct for HTTP poke parameters. // HTTPPokeParams is a struct for HTTP poke parameters.
type HTTPPokeParams struct { type HTTPPokeParams struct {
Timeout time.Duration Timeout time.Duration // default = 10 secs
ExpectCode int // default = 200 ExpectCode int // default = 200
BodyContains string BodyContains string
RetriableCodes []int RetriableCodes []int
@ -981,6 +981,10 @@ func PokeHTTP(host string, port int, path string, params *HTTPPokeParams) HTTPPo
params.ExpectCode = http.StatusOK params.ExpectCode = http.StatusOK
} }
if params.Timeout == 0 {
params.Timeout = 10 * time.Second
}
framework.Logf("Poking %q", url) framework.Logf("Poking %q", url)
resp, err := httpGetNoConnectionPoolTimeout(url, params.Timeout) resp, err := httpGetNoConnectionPoolTimeout(url, params.Timeout)

9
test/e2e/network/loadbalancer.go
View File

@ -848,7 +848,7 @@ var _ = common.SIGDescribe("LoadBalancers", func() {
}) })
}) })
var _ = common.SIGDescribe("ESIPP [Slow]", func() { var _ = common.SIGDescribe("LoadBalancers ESIPP [Slow]", func() {
f := framework.NewDefaultFramework("esipp") f := framework.NewDefaultFramework("esipp")
var loadBalancerCreateTimeout time.Duration var loadBalancerCreateTimeout time.Duration
@ -1196,8 +1196,8 @@ var _ = common.SIGDescribe("ESIPP [Slow]", func() {
// Poll till kube-proxy re-adds the MASQUERADE rule on the node. // Poll till kube-proxy re-adds the MASQUERADE rule on the node.
ginkgo.By(fmt.Sprintf("checking source ip is NOT preserved through loadbalancer %v", ingressIP)) ginkgo.By(fmt.Sprintf("checking source ip is NOT preserved through loadbalancer %v", ingressIP))
var clientIP string var clientIP string
pollErr := wait.PollImmediate(framework.Poll, e2eservice.KubeProxyLagTimeout, func() (bool, error) { pollErr := wait.PollImmediate(framework.Poll, 3*e2eservice.KubeProxyLagTimeout, func() (bool, error) {
clientIP, err := GetHTTPContent(ingressIP, svcTCPPort, e2eservice.KubeProxyLagTimeout, "/clientip") clientIP, err := GetHTTPContent(ingressIP, svcTCPPort, e2eservice.KubeProxyLagTimeout, path)
if err != nil { if err != nil {
return false, nil return false, nil
} }
@ -1223,7 +1223,8 @@ var _ = common.SIGDescribe("ESIPP [Slow]", func() {
svc.Spec.HealthCheckNodePort = int32(healthCheckNodePort) svc.Spec.HealthCheckNodePort = int32(healthCheckNodePort)
}) })
framework.ExpectNoError(err) framework.ExpectNoError(err)
pollErr = wait.PollImmediate(framework.Poll, e2eservice.KubeProxyLagTimeout, func() (bool, error) { loadBalancerPropagationTimeout := e2eservice.GetServiceLoadBalancerPropagationTimeout(cs)
pollErr = wait.PollImmediate(framework.PollShortTimeout, loadBalancerPropagationTimeout, func() (bool, error) {
clientIP, err := GetHTTPContent(ingressIP, svcTCPPort, e2eservice.KubeProxyLagTimeout, path) clientIP, err := GetHTTPContent(ingressIP, svcTCPPort, e2eservice.KubeProxyLagTimeout, path)
if err != nil { if err != nil {
return false, nil return false, nil