Reorder pod terminating check

jsoriano · Apr 8, 2021 · 8674201 · 8674201
1 parent 43cf27f
commit 8674201
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/libbeat/autodiscover/providers/kubernetes/pod.go b/libbeat/autodiscover/providers/kubernetes/pod.go
@@ -426,17 +426,16 @@ func (p *pod) emit(pod *kubernetes.Pod, flag string) {
 
 // podTerminating returns true if a pod is marked for deletion or is in a phase beyond running.
 func podTerminating(pod *kubernetes.Pod) bool {
-	if pod.GetObjectMeta().GetDeletionTimestamp() != nil {
-		return true
+	switch pod.Status.Phase {
+	case kubernetes.PodPending, kubernetes.PodRunning:
+		return false
 	}
 
-	switch pod.Status.Phase {
-	case kubernetes.PodRunning, kubernetes.PodPending:
-	default:
-		return true
+	if pod.GetObjectMeta().GetDeletionTimestamp() == nil {
+		return false
 	}
 
-	return false
+	return true
 }
 
 // podAnnotations returns the annotations in a pod