Merge ca63359 into b293d9b

Yelp · Nov 3, 2020 · a0f7def · a0f7def
2 parents b293d9b + ca63359
commit a0f7def
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/paasta_tools/kubernetes_tools.py b/paasta_tools/kubernetes_tools.py
@@ -117,6 +117,7 @@
 from paasta_tools.long_running_service_tools import LongRunningServiceConfigDict
 from paasta_tools.long_running_service_tools import ServiceNamespaceConfig
 from paasta_tools.marathon_tools import AutoscalingParamsDict
+from paasta_tools.paastaapi.exceptions import ApiAttributeError
 from paasta_tools.secret_providers import BaseSecretProvider
 from paasta_tools.secret_tools import get_secret_name_from_ref
 from paasta_tools.secret_tools import is_secret_ref
@@ -1912,7 +1913,11 @@ def format_pod_event_messages(
     rows: List[str] = list()
     rows.append(PaastaColors.blue(f"Pod Events for {pod_name}"))
     for message in pod_event_messages:
-        rows.append(f"   Event at {message['timeStamp']}: {message['message']}")
+        try:
+            timestamp = message["timeStamp"]
+        except ApiAttributeError:
+            timestamp = "unknown time"
+        rows.append(f"   Event at {timestamp}: {message['message']}")
     return rows