Merge branch 'aws-containers:main' into pod-scan

Author: Bourne-ID-Work

main.go

@@ -75,7 +75,9 @@ func main() {
 		sockFound, err = runCluster(*requestedNamespace, w, *verbose, *progressBar)
 	}
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "error: %v", err)
+		fmt.Fprintf(os.Stderr, "error: %v\n", err)
+		fmt.Fprintln(os.Stderr, "Warning: The following table may be incomplete due to errors detected during the run")
+		w.Flush()
 		os.Exit(1)
 	}
 	if *exitErr && sockFound {
@@ -271,9 +273,8 @@ func printResources(namespace corev1.Namespace, clientset *kubernetes.Clientset,
 						continue
 					}
 
-					// check if the job has an owner
-					// If it does then it's part of a CronJob
-					if len(job.ObjectMeta.OwnerReferences) == 0 {
+					// check if the job has an owner, and that it is of kind `CronJob`
+					if len(job.ObjectMeta.OwnerReferences) == 0 || job.ObjectMeta.OwnerReferences[0].Kind != "CronJob" {
 						if _, ok := nsJobs[job.Name]; !ok {
 							nsJobs[job.Name] = job
 						}