Merge branch 'main' into fix-node-selection

vmware-tanzu · Sep 17, 2024 · 79ab0d6 · 79ab0d6
2 parents 1014062 + 18bb79d
commit 79ab0d6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/client/logs_test.go b/pkg/client/logs_test.go
@@ -21,7 +21,6 @@ import (
 	"testing"
 
 	"github.com/pkg/errors"
-	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -255,14 +254,14 @@ func TestLogReaderInvalidConfig(t *testing.T) {
 
 func TestPodsForLogs(t *testing.T) {
 	pluginName := "my-plugin"
-	pluginPod := corev1.Pod{
+	pluginPod := v1.Pod{
 		ObjectMeta: metav1.ObjectMeta{
 			Labels: map[string]string{
 				"sonobuoy-plugin": pluginName,
 			},
 		},
 	}
-	allPods := &corev1.PodList{Items: []corev1.Pod{pluginPod, {}}}
+	allPods := &v1.PodList{Items: []v1.Pod{pluginPod, {}}}
 	testCases := []struct {
 		desc                  string
 		pluginName            string

diff --git a/pkg/client/retrieve.go b/pkg/client/retrieve.go
@@ -60,6 +60,7 @@ func (c *SonobuoyClient) RetrieveResults(cfg *RetrieveConfig) (io.Reader, <-chan
 	ec := make(chan error, 1)
 	client, err := c.Client()
 	if err != nil {
+		ec <- err
 		return nil, ec, nil
 	}