Merge pull request #130 from hjacobs/handle-empty-time-string

#129 handle pods in strange error state
hjacobs · Feb 28, 2017 · 1181f36 · 1181f36
2 parents d4fdf1a + 5bdef77
commit 1181f36
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/kube_ops_view/kubernetes.py b/kube_ops_view/kubernetes.py
@@ -84,11 +84,12 @@ def query_kubernetes_cluster(cluster):
         if obj['phase'] in ('Succeeded', 'Failed'):
             last_termination_time = 0
             for container in obj['containers']:
-                termination_time = container.get('state', {}).get('terminated', {}).get('finishedAt', '')
-                termination_time = parse_time(termination_time)
-                if termination_time > last_termination_time:
-                    last_termination_time = termination_time
-            if last_termination_time < now - 3600:
+                termination_time = container.get('state', {}).get('terminated', {}).get('finishedAt')
+                if termination_time:
+                    termination_time = parse_time(termination_time)
+                    if termination_time > last_termination_time:
+                        last_termination_time = termination_time
+            if last_termination_time and last_termination_time < now - 3600:
                 # the job/pod finished more than an hour ago
                 # => filter out
                 continue