Merge pull request #132400 from xigang/orphan_pod_index

k8s-ci-robot · web-flow · commit ccf291b50166 · 2025-06-20T18:46:51.000-07:00
Add namespace-aware orphan pod indexing for improved controller performance
diff --git a/pkg/controller/controller_utils.go b/pkg/controller/controller_utils.go
@@ -1083,6 +1083,11 @@ func AddPodNodeNameIndexer(podInformer cache.SharedIndexInformer) error {
 	})
 }
 
+// OrphanPodIndexKeyForNamespace returns the orphan pod index key for a specific namespace.
+func OrphanPodIndexKeyForNamespace(namespace string) string {
+	return OrphanPodIndexKey + "/" + namespace
+}
+
 // AddPodControllerUIDIndexer adds an indexer for Pod's controllerRef.UID to the given PodInformer.
 // This indexer is used to efficiently look up pods by their ControllerRef.UID
 func AddPodControllerUIDIndexer(podInformer cache.SharedIndexInformer) error {
@@ -1100,9 +1105,9 @@ func AddPodControllerUIDIndexer(podInformer cache.SharedIndexInformer) error {
 			if ref := metav1.GetControllerOf(pod); ref != nil {
 				return []string{string(ref.UID)}, nil
 			}
-			// If the Pod has no controller (i.e., it's orphaned), index it with the OrphanPodIndexKey
+			// If the Pod has no controller (i.e., it's orphaned), index it with the OrphanPodIndexKeyForNamespace
 			// This helps identify orphan pods for reconciliation and adoption by controllers
-			return []string{OrphanPodIndexKey}, nil
+			return []string{OrphanPodIndexKeyForNamespace(pod.Namespace)}, nil
 		},
 	})
 }
diff --git a/pkg/controller/daemon/daemon_controller.go b/pkg/controller/daemon/daemon_controller.go
@@ -696,7 +696,7 @@ func (dsc *DaemonSetsController) getDaemonPodsFromCache(ds *apps.DaemonSet) ([]*
 	//  The OrphanPodIndexKey, which helps identify orphaned Pods that are not currently managed by any controller,
 	//   but may be adopted later on if they have matching labels with the Daemonset.
 	podsForDS := []*v1.Pod{}
-	for _, key := range []string{string(ds.UID), controller.OrphanPodIndexKey} {
+	for _, key := range []string{string(ds.UID), controller.OrphanPodIndexKeyForNamespace(ds.Namespace)} {
 		podObjs, err := dsc.podIndexer.ByIndex(controller.PodControllerUIDIndex, key)
 		if err != nil {
 			return nil, err
diff --git a/pkg/controller/job/job_controller.go b/pkg/controller/job/job_controller.go
@@ -811,7 +811,7 @@ func (jm *Controller) getPodsForJob(ctx context.Context, j *batch.Job) ([]*v1.Po
 // getJobPodsByIndexer returns the set of pods that this Job should manage.
 func (jm *Controller) getJobPodsByIndexer(j *batch.Job) ([]*v1.Pod, error) {
 	podsForJob := []*v1.Pod{}
-	for _, key := range []string{string(j.UID), controller.OrphanPodIndexKey} {
+	for _, key := range []string{string(j.UID), controller.OrphanPodIndexKeyForNamespace(j.Namespace)} {
 		pods, err := jm.podIndexer.ByIndex(controller.PodControllerUIDIndex, key)
 		if err != nil {
 			return nil, err
diff --git a/pkg/controller/replicaset/replica_set.go b/pkg/controller/replicaset/replica_set.go
@@ -705,7 +705,7 @@ func (rsc *ReplicaSetController) getRSPods(rs *apps.ReplicaSet, orphanedPods boo
 
 	uidKeys := []string{string(rs.UID)}
 	if orphanedPods {
-		uidKeys = append(uidKeys, controller.OrphanPodIndexKey)
+		uidKeys = append(uidKeys, controller.OrphanPodIndexKeyForNamespace(rs.Namespace))
 	}
 
 	for _, key := range uidKeys {
diff --git a/pkg/controller/statefulset/stateful_set.go b/pkg/controller/statefulset/stateful_set.go
@@ -317,7 +317,7 @@ func (ssc *StatefulSetController) getPodsForStatefulSet(ctx context.Context, set
 	//  The OrphanPodIndexKey, which helps identify orphaned Pods that are not currently managed by any controller,
 	//   but may be adopted later on if they have matching labels with the StatefulSet.
 	podsForSts := []*v1.Pod{}
-	for _, key := range []string{string(set.UID), controller.OrphanPodIndexKey} {
+	for _, key := range []string{string(set.UID), controller.OrphanPodIndexKeyForNamespace(set.Namespace)} {
 		podObjs, err := ssc.podIndexer.ByIndex(controller.PodControllerUIDIndex, key)
 		if err != nil {
 			return nil, err

Original file line number	Diff line number	Diff line change
`@@ -705,7 +705,7 @@ func (rsc ReplicaSetController) getRSPods(rs apps.ReplicaSet, orphanedPods boo`
`705`	`705`
`706`	`706`	`uidKeys := []string{string(rs.UID)}`
`707`	`707`	`if orphanedPods {`
`708`		`- uidKeys = append(uidKeys, controller.OrphanPodIndexKey)`
	`708`	`+ uidKeys = append(uidKeys, controller.OrphanPodIndexKeyForNamespace(rs.Namespace))`
`709`	`709`	`}`
`710`	`710`
`711`	`711`	`for _, key := range uidKeys {`