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

Merge pull request #84837 from justinsb/fix_get_kubelet_pods

Browse Source 
e2e: Fix error where pods not logged
This commit is contained in:
Kubernetes Prow Robot 2019-11-12 10:23:28 -08:00 committed by GitHub
commit 6b642dae87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/framework/util.go
View File

@ -1264,7 +1264,6 @@ func DumpNodeDebugInfo(c clientset.Interface, nodeNames []string, logFunc func(f
// getKubeletPods retrieves the list of pods on the kubelet. // getKubeletPods retrieves the list of pods on the kubelet.
func getKubeletPods(c clientset.Interface, node string) (*v1.PodList, error) { func getKubeletPods(c clientset.Interface, node string) (*v1.PodList, error) {
var result *v1.PodList
var client restclient.Result var client restclient.Result
finished := make(chan struct{}, 1) finished := make(chan struct{}, 1)
go func() { go func() {
@ -1280,6 +1279,7 @@ func getKubeletPods(c clientset.Interface, node string) (*v1.PodList, error) {
}() }()
select { select {
case <-finished: case <-finished:
result := &v1.PodList{}
if err := client.Into(result); err != nil { if err := client.Into(result); err != nil {
return &v1.PodList{}, err return &v1.PodList{}, err
} }