Merge pull request #17 from MrFishFinger/handle-non-cronjob-managed-jobs

rothgar · web-flow · commit 6e839c8f885a · 2023-08-03T13:25:03.000-07:00
fix: ensure that Job owner is actually a CronJob before appending it
diff --git a/main.go b/main.go
@@ -273,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
 						}

Original file line number	Diff line number	Diff line change
`@@ -273,9 +273,8 @@ func printResources(namespace corev1.Namespace, clientset *kubernetes.Clientset,`
`273`	`273`	`continue`
`274`	`274`	`}`
`275`	`275`
`276`		`- // check if the job has an owner`
`277`		`- // If it does then it's part of a CronJob`
`278`		`- if len(job.ObjectMeta.OwnerReferences) == 0 {`
	`276`	+ // check if the job has an owner, and that it is of kind `CronJob`
	`277`	`+ if len(job.ObjectMeta.OwnerReferences) == 0 \|\| job.ObjectMeta.OwnerReferences[0].Kind != "CronJob" {`
`279`	`278`	`if _, ok := nsJobs[job.Name]; !ok {`
`280`	`279`	`nsJobs[job.Name] = job`
`281`	`280`	`}`