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

don´t panic on e2e ESIPP tests

Browse Source 
The ESIPP tests are using a function to poll an HTTP endpoint.
This function failed the framework if the request to the http endpoint
timed out, causing a panic that ginkgo couldn´t recover.

Also, this function was used inside a pollImmediate loop, so it should
return the error instead of fail.
This commit is contained in:
Antonio Ojea 2021-01-08 10:52:49 +01:00
parent d1db90ba57
commit 6bedf4a98b
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/e2e/network/service.go
View File

@ -3015,8 +3015,8 @@ var _ = SIGDescribe("ESIPP [Slow]", func() {
ingressIP := e2eservice.GetIngressPoint(&svc.Status.LoadBalancer.Ingress[0]) ingressIP := e2eservice.GetIngressPoint(&svc.Status.LoadBalancer.Ingress[0])
ginkgo.By("reading clientIP using the TCP service's service port via its external VIP") ginkgo.By("reading clientIP using the TCP service's service port via its external VIP")
content := GetHTTPContent(ingressIP, svcTCPPort, e2eservice.KubeProxyLagTimeout, "/clientip") clientIP, err := GetHTTPContent(ingressIP, svcTCPPort, e2eservice.KubeProxyLagTimeout, "/clientip")
clientIP := content.String() framework.ExpectNoError(err)
framework.Logf("ClientIP detected by target pod using VIP:SvcPort is %s", clientIP) framework.Logf("ClientIP detected by target pod using VIP:SvcPort is %s", clientIP)
ginkgo.By("checking if Source IP is preserved") ginkgo.By("checking if Source IP is preserved")
@ -3298,8 +3298,10 @@ var _ = SIGDescribe("ESIPP [Slow]", func() {
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, e2eservice.KubeProxyLagTimeout, func() (bool, error) {
content := GetHTTPContent(ingressIP, svcTCPPort, e2eservice.KubeProxyLagTimeout, "/clientip") clientIP, err := GetHTTPContent(ingressIP, svcTCPPort, e2eservice.KubeProxyLagTimeout, "/clientip")
clientIP = content.String() if err != nil {
return false, nil
}
if strings.HasPrefix(clientIP, "10.") { if strings.HasPrefix(clientIP, "10.") {
return true, nil return true, nil
} }
@ -3323,8 +3325,10 @@ var _ = SIGDescribe("ESIPP [Slow]", func() {
}) })
framework.ExpectNoError(err) framework.ExpectNoError(err)
pollErr = wait.PollImmediate(framework.Poll, e2eservice.KubeProxyLagTimeout, func() (bool, error) { pollErr = wait.PollImmediate(framework.Poll, e2eservice.KubeProxyLagTimeout, func() (bool, error) {
content := GetHTTPContent(ingressIP, svcTCPPort, e2eservice.KubeProxyLagTimeout, path) clientIP, err := GetHTTPContent(ingressIP, svcTCPPort, e2eservice.KubeProxyLagTimeout, path)
clientIP = content.String() if err != nil {
return false, nil
}
ginkgo.By(fmt.Sprintf("Endpoint %v:%v%v returned client ip %v", ingressIP, svcTCPPort, path, clientIP)) ginkgo.By(fmt.Sprintf("Endpoint %v:%v%v returned client ip %v", ingressIP, svcTCPPort, path, clientIP))
if !strings.HasPrefix(clientIP, "10.") { if !strings.HasPrefix(clientIP, "10.") {
return true, nil return true, nil

11
test/e2e/network/util.go
View File

@ -37,19 +37,20 @@ import (
const secondNodePortSvcName = "second-node-port-service" const secondNodePortSvcName = "second-node-port-service"
// GetHTTPContent returns the content of the given url by HTTP. // GetHTTPContent returns the content of the given url by HTTP.
func GetHTTPContent(host string, port int, timeout time.Duration, url string) bytes.Buffer { func GetHTTPContent(host string, port int, timeout time.Duration, url string) (string, error) {
var body bytes.Buffer var body bytes.Buffer
if pollErr := wait.PollImmediate(framework.Poll, timeout, func() (bool, error) { pollErr := wait.PollImmediate(framework.Poll, timeout, func() (bool, error) {
result := e2enetwork.PokeHTTP(host, port, url, nil) result := e2enetwork.PokeHTTP(host, port, url, nil)
if result.Status == e2enetwork.HTTPSuccess { if result.Status == e2enetwork.HTTPSuccess {
body.Write(result.Body) body.Write(result.Body)
return true, nil return true, nil
} }
return false, nil return false, nil
}); pollErr != nil { })
framework.Failf("Could not reach HTTP service through %v:%v%v after %v: %v", host, port, url, timeout, pollErr) if pollErr != nil {
framework.Logf("Could not reach HTTP service through %v:%v%v after %v: %v", host, port, url, timeout, pollErr)
} }
return body return body.String(), pollErr
} }
// GetHTTPContentFromTestContainer returns the content of the given url by HTTP via a test container. // GetHTTPContentFromTestContainer returns the content of the given url by HTTP via a test container.