Merge pull request #3729 from slalwani97/update-terminating-state

Update pod status to terminating
weaveworks · Nov 26, 2019 · 5dc8332 · 5dc8332
2 parents 5345052 + 1ce7707
commit 5dc8332
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/probe/kubernetes/pod.go b/probe/kubernetes/pod.go
@@ -56,6 +56,10 @@ func (p *pod) AddParent(topology, id string) {
 }
 
 func (p *pod) State() string {
+	if p.ObjectMeta.DeletionTimestamp != nil {
+		return "Terminating"
+	}
+
 	return string(p.Status.Phase)
 }
 
@@ -83,8 +87,8 @@ func (p *pod) VolumeClaimNames() []string {
 
 func (p *pod) GetNode(probeID string) report.Node {
 	latests := map[string]string{
-		State: p.State(),
-		IP:    p.Status.PodIP,
+		State:                 p.State(),
+		IP:                    p.Status.PodIP,
 		report.ControlProbeID: probeID,
 		RestartCount:          strconv.FormatUint(uint64(p.RestartCount()), 10),
 	}