Link CronJob jobs to runtime pods

Author: rootsec1

src-tauri/src/kube_commands.rs

@@ -1558,6 +1558,15 @@ fn resource_age(metadata: &ObjectMeta) -> String {
         .unwrap_or_else(|| "live".to_string())
 }
 
+fn owner_label(metadata: &ObjectMeta) -> String {
+    metadata
+        .owner_references
+        .as_ref()
+        .and_then(|owners| owners.first())
+        .map(|owner| format!("{}/{}", owner.kind, owner.name))
+        .unwrap_or_default()
+}
+
 async fn list_pods(client: Client, cluster: &str) -> Result<Vec<ResourceSummary>, String> {
     let pods = Api::<Pod>::all(client)
         .list(&ListParams::default())
@@ -1584,13 +1593,7 @@ async fn list_pods(client: Client, cluster: &str) -> Result<Vec<ResourceSummary>
                 .map(|status| status.image.clone())
                 .unwrap_or_default();
             let status = pod_status(&pod, restarts);
-            let owner = pod
-                .metadata
-                .owner_references
-                .as_ref()
-                .and_then(|owners| owners.first())
-                .map(|owner| format!("{}/{}", owner.kind, owner.name))
-                .unwrap_or_default();
+            let owner = owner_label(&pod.metadata);
             let labels = pod.metadata.labels.clone().unwrap_or_default();
             let references = pod_dependency_references(&pod, &namespace);
             let node_name = pod
@@ -1675,13 +1678,7 @@ async fn list_replicasets(client: Client, cluster: &str) -> Result<Vec<ResourceS
                 .unwrap_or_default();
             let labels = replicaset.metadata.labels.clone().unwrap_or_default();
             let selector = replicaset.spec.as_ref().and_then(|spec| spec.selector.match_labels.clone()).unwrap_or_default();
-            let owner = replicaset
-                .metadata
-                .owner_references
-                .as_ref()
-                .and_then(|owners| owners.first())
-                .map(|owner| format!("{}/{}", owner.kind, owner.name))
-                .unwrap_or_default();
+            let owner = owner_label(&replicaset.metadata);
 
             resource_summary(
                 "ReplicaSet",
@@ -1805,6 +1802,13 @@ async fn list_jobs(client: Client, cluster: &str) -> Result<Vec<ResourceSummary>
                 .map(|container| container.image.clone().unwrap_or_default())
                 .unwrap_or_default();
             let labels = job.metadata.labels.clone().unwrap_or_default();
+            let selector = job
+                .spec
+                .as_ref()
+                .and_then(|spec| spec.selector.as_ref())
+                .and_then(|selector| selector.match_labels.clone())
+                .unwrap_or_default();
+            let owner = owner_label(&job.metadata);
 
             resource_summary(
                 "Job",
@@ -1817,6 +1821,8 @@ async fn list_jobs(client: Client, cluster: &str) -> Result<Vec<ResourceSummary>
             )
             .with_age(age)
             .with_labels(labels)
+            .with_owner(owner)
+            .with_selector(selector)
         })
         .collect())
 }
@@ -3175,6 +3181,7 @@ mod tests {
         HTTPIngressPath, HTTPIngressRuleValue, IngressBackend, IngressRule, IngressServiceBackend,
         IngressSpec, ServiceBackendPort,
     };
+    use k8s_openapi::apimachinery::pkg::apis::meta::v1::OwnerReference;
 
     #[test]
     fn running_ready_pod_without_restarts_is_healthy() {
@@ -3183,6 +3190,22 @@ mod tests {
         assert_eq!(pod_status(&pod, 0), HealthState::Healthy);
     }
 
+    #[test]
+    fn owner_label_preserves_controller_lineage() {
+        let metadata = ObjectMeta {
+            owner_references: Some(vec![OwnerReference {
+                api_version: "batch/v1".to_string(),
+                kind: "CronJob".to_string(),
+                name: "nightly-reconcile".to_string(),
+                uid: "uid-1".to_string(),
+                ..OwnerReference::default()
+            }]),
+            ..ObjectMeta::default()
+        };
+
+        assert_eq!(owner_label(&metadata), "CronJob/nightly-reconcile");
+    }
+
     #[test]
     fn running_crashlooping_pod_is_critical() {
         let pod = pod_with_status(

src/components/ResourceDetail.tsx

@@ -1,7 +1,7 @@
 import { useEffect, useMemo, useRef, useState } from "react";
 import { Activity, ArrowLeft, Box, CheckCircle2, FileText, GitCommitHorizontal, ImageIcon, Network, RotateCw, Server, ShieldAlert, Skull, Star, TerminalSquare } from "lucide-react";
 import { containerCurrentState, containerLastState, currentStateTime, lastStateTime } from "../lib/podLifecycle";
-import { matchesSelector, ownsPod, referencesResource, workloadKinds } from "../lib/resourceRelationships";
+import { matchesSelector, ownsPod, ownsResource, referencesResource, workloadKinds } from "../lib/resourceRelationships";
 import type { ContainerDetails, HealthState, PodActionResult, PodCondition, ResourceDetails, ResourceRow } from "../types/kube";
 import { PodEventRail } from "./PodEventRail";
 import { PodIssueStrip } from "./PodIssueStrip";
@@ -1007,9 +1007,26 @@ function workloadPodsFor(resource: ResourceRow, resources: ResourceRow[]) {
     return [];
   }
 
+  if (resource.kind === "CronJob") {
+    const jobs = cronJobJobsFor(resource, resources);
+    return resources.filter((item) =>
+      item.kind === "Pod" &&
+      item.namespace === resource.namespace &&
+      jobs.some((job) => ownsPod(job, item))
+    );
+  }
+
   return resources.filter((item) => item.kind === "Pod" && item.namespace === resource.namespace && ownsPod(resource, item));
 }
 
+function cronJobJobsFor(resource: ResourceRow, resources: ResourceRow[]) {
+  if (resource.kind !== "CronJob") {
+    return [];
+  }
+
+  return resources.filter((item) => item.kind === "Job" && ownsResource(resource, item));
+}
+
 function nodePodsFor(resource: ResourceRow, resources: ResourceRow[]) {
   if (resource.kind !== "Node") {
     return [];
@@ -1329,8 +1346,18 @@ function hierarchyFor(resource: ResourceRow, resources: ResourceRow[]): Hierarch
     ];
   }
 
+  if (resource.kind === "CronJob") {
+    const jobs = cronJobJobsFor(resource, resources);
+    const pods = workloadPodsFor(resource, resources);
+    return [
+      { title: "Jobs", resources: jobs },
+      { title: "Pods", resources: pods },
+      { title: "Config nearby", resources: resources.filter((item) => item.namespace === resource.namespace && ["ConfigMap", "Secret"].includes(item.kind)) },
+    ];
+  }
+
   if (workloadKinds.has(resource.kind)) {
-    const pods = resources.filter((item) => item.kind === "Pod" && item.namespace === resource.namespace && ownsPod(resource, item));
+    const pods = workloadPodsFor(resource, resources);
     const services = resources.filter(
       (item) =>
         item.kind === "Service" &&

src/lib/resourceRelationships.ts

@@ -2,8 +2,12 @@ import type { ResourceRow } from "../types/kube";
 
 export const workloadKinds = new Set(["Deployment", "StatefulSet", "DaemonSet", "Job", "CronJob", "ReplicaSet"]);
 
+export function ownsResource(owner: ResourceRow, child: ResourceRow) {
+  return child.namespace === owner.namespace && child.owner === `${owner.kind}/${owner.name}`;
+}
+
 export function ownsPod(owner: ResourceRow, pod: ResourceRow) {
-  if (pod.owner.includes(`/${owner.name}`)) {
+  if (ownsResource(owner, pod)) {
     return true;
   }
   if (owner.kind === "Deployment" && pod.owner.startsWith(`ReplicaSet/${owner.name}-`)) {