Better defaults for PodLogOptions

Fixes #475

Signed-off-by: Chuck Ha <[email protected]>

pkg/discovery/pods.go

@@ -36,6 +36,20 @@ const (
 	PodLogsLocation = "podlogs"
 )
 
+// Only set values if they have values greater than 0 (as in they user specified).
+func getPodLogOptions(container string, limitBytes, sinceSeconds int64) *v1.PodLogOptions {
+	options := &v1.PodLogOptions{
+		Container: container,
+	}
+	if limitBytes > 0 {
+		options.LimitBytes = &limitBytes
+	}
+	if sinceSeconds > 0 {
+		options.SinceSeconds = &sinceSeconds
+	}
+	return options
+}
+
 // gatherPodLogs will loop through collecting pod logs and placing them into a directory tree
 func gatherPodLogs(kubeClient kubernetes.Interface, ns string, opts metav1.ListOptions, cfg *config.Config) error {
 	// 1 - Collect the list of pods
@@ -56,19 +70,11 @@ func gatherPodLogs(kubeClient kubernetes.Interface, ns string, opts metav1.ListO
 			continue
 		}
 		for _, container := range pod.Spec.Containers {
-			body, err := kubeClient.CoreV1().Pods(ns).GetLogs(
-				pod.Name,
-				&v1.PodLogOptions{
-					Container:    container.Name,
-					LimitBytes:   &limitBytes,
-					SinceSeconds: &limitTime,
-				},
-			).Do().Raw()
-
+			options := getPodLogOptions(container.Name, limitBytes, limitTime)
+			body, err := kubeClient.CoreV1().Pods(ns).GetLogs(pod.Name, options).DoRaw()
 			if err != nil {
 				return errors.WithStack(err)
 			}
-
 			outdir := path.Join(cfg.OutputDir(), PodLogsLocation, ns, pod.Name, "logs")
 			if err = os.MkdirAll(outdir, 0755); err != nil {
 				return errors.WithStack(err)

pkg/discovery/queries.go

@@ -375,13 +375,14 @@ func QueryClusterResources(kubeClient kubernetes.Interface, recorder *QueryRecor
 			// is odd and would pollute some of the output.
 
 			start := time.Now()
+			// TODO(chuckha) look at FieldSelector for list options{}
 			nodeList, err := kubeClient.CoreV1().Nodes().List(metav1.ListOptions{})
 			if err != nil {
 				errlog.LogError(fmt.Errorf("failed to get node list: %v", err))
 				// Do not return or continue because we also want to query nodes as resources
 				break
 			}
-			nodeNames := make([]string, nodeList.Size())
+			nodeNames := make([]string, len(nodeList.Items))
 			for i, node := range nodeList.Items {
 				nodeNames[i] = node.Name
 			}