github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-17 15:50:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #93491 from robscott/endpointslice-test-logging

Browse Source 
Improving logging in EndpointSlice e2e tests
This commit is contained in:
Kubernetes Prow Robot 2020-07-28 10:09:48 -07:00 committed by GitHub
commit 498b1e2279
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/e2e/network/endpointslice.go
View File

@ -18,6 +18,7 @@ package network
import ( import (
"context" "context"
"encoding/json"
"fmt" "fmt"
"time" "time"
@ -311,13 +312,12 @@ func expectEndpointsAndSlices(cs clientset.Interface, ns string, svc *v1.Service
if err := wait.PollImmediate(5*time.Second, 2*time.Minute, func() (bool, error) { if err := wait.PollImmediate(5*time.Second, 2*time.Minute, func() (bool, error) {
endpointSlicesFound, hasMatchingSlices := hasMatchingEndpointSlices(cs, ns, svc.Name, len(pods), numSlices) endpointSlicesFound, hasMatchingSlices := hasMatchingEndpointSlices(cs, ns, svc.Name, len(pods), numSlices)
if !hasMatchingSlices { if !hasMatchingSlices {
framework.Logf("Matching EndpointSlices not found")
return false, nil return false, nil
} }
endpointSlices = endpointSlicesFound endpointSlices = endpointSlicesFound
return true, nil return true, nil
}); err != nil { }); err != nil {
framework.Failf("Timed out waiting for matching EndpointSlices to exist: %v", err) framework.Failf("Timed out waiting for EndpointSlices to match expectations: %v", err)
} }
endpoints := &v1.Endpoints{} endpoints := &v1.Endpoints{}
@ -330,7 +330,7 @@ func expectEndpointsAndSlices(cs clientset.Interface, ns string, svc *v1.Service
endpoints = endpointsFound endpoints = endpointsFound
return true, nil return true, nil
}); err != nil { }); err != nil {
framework.Failf("Timed out waiting for matching Endpoints to exist: %v", err) framework.Failf("Timed out waiting for Endpoints to match expectations: %v", err)
} }
podsByIP := map[string]*v1.Pod{} podsByIP := map[string]*v1.Pod{}
@ -494,7 +494,15 @@ func hasMatchingEndpointSlices(cs clientset.Interface, ns, svcName string, numEn
} }
if len(esList.Items) != numSlices { if len(esList.Items) != numSlices {
framework.Logf("Expected %d EndpointSlices for Service %s/%s, got %d", numSlices, ns, svcName, len(esList.Items)) framework.Logf("Expected %d EndpointSlices for Service %s/%s, got %d", numSlices, ns, svcName, len(esList.Items))
return []discoveryv1beta1.EndpointSlice{}, false for i, epSlice := range esList.Items {
epsData, err := json.Marshal(epSlice)
if err != nil {
framework.Logf("Error marshaling JSON for EndpointSlice: %v", err)
} else {
framework.Logf("%d - %v", i, string(epsData))
}
}
return esList.Items, false
} }
actualNumEndpoints := 0 actualNumEndpoints := 0
@ -503,7 +511,7 @@ func hasMatchingEndpointSlices(cs clientset.Interface, ns, svcName string, numEn
} }
if actualNumEndpoints != numEndpoints { if actualNumEndpoints != numEndpoints {
framework.Logf("EndpointSlices for %s/%s Service have %d/%d endpoints", ns, svcName, actualNumEndpoints, numEndpoints) framework.Logf("EndpointSlices for %s/%s Service have %d/%d endpoints", ns, svcName, actualNumEndpoints, numEndpoints)
return []discoveryv1beta1.EndpointSlice{}, false return esList.Items, false
} }
return esList.Items, true return esList.Items, true