scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-10-31 10:18:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #112663 from aojea/reachability

Browse Source 
do not assume backend on e2e service jig
This commit is contained in:
Kubernetes Prow Robot
2022-09-22 12:51:28 -07:00
committed by GitHub
parent 9cd59bfc38 909a08d011
commit 4af079a3a1
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/e2e/framework/service/jig.go
View File

@@ -902,24 +902,20 @@ func testEndpointReachability(endpoint string, port int32, protocol v1.Protocol,
cmd := "" cmd := ""
switch protocol { switch protocol {
case v1.ProtocolTCP: case v1.ProtocolTCP:
cmd = fmt.Sprintf("echo hostName | nc -v -t -w 2 %s %v", endpoint, port) cmd = fmt.Sprintf("nc -v -z -w 2 %s %v", endpoint, port)
case v1.ProtocolUDP: case v1.ProtocolUDP:
cmd = fmt.Sprintf("echo hostName | nc -v -u -w 2 %s %v", endpoint, port) cmd = fmt.Sprintf("nc -v -z -u -w 2 %s %v", endpoint, port)
default: default:
return fmt.Errorf("service reachability check is not supported for %v", protocol) return fmt.Errorf("service reachability check is not supported for %v", protocol)
} }
err := wait.PollImmediate(1*time.Second, ServiceReachabilityShortPollTimeout, func() (bool, error) { err := wait.PollImmediate(1*time.Second, ServiceReachabilityShortPollTimeout, func() (bool, error) {
stdout, err := framework.RunHostCmd(execPod.Namespace, execPod.Name, cmd) _, err := framework.RunHostCmd(execPod.Namespace, execPod.Name, cmd)
if err != nil { if err != nil {
framework.Logf("Service reachability failing with error: %v\nRetrying...", err) framework.Logf("Service reachability failing with error: %v\nRetrying...", err)
return false, nil return false, nil
} }
trimmed := strings.TrimSpace(stdout) return true, nil
if trimmed != "" {
return true, nil
}
return false, nil
}) })
if err != nil { if err != nil {
return fmt.Errorf("service is not reachable within %v timeout on endpoint %s over %s protocol", ServiceReachabilityShortPollTimeout, ep, protocol) return fmt.Errorf("service is not reachable within %v timeout on endpoint %s over %s protocol", ServiceReachabilityShortPollTimeout, ep, protocol)