Merge pull request #205 from Mirantis/fixpodbynode

Fix bug in list_pods_by_node method and improve logging
Mirantis · Jan 24, 2018 · d09fc07 · d09fc07
2 parents 3620cfe + cb9a9e6
commit d09fc07
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/kqueen/kubeapi.py b/kqueen/kubeapi.py
@@ -127,7 +127,9 @@ def list_pods(self, include_uninitialized=True):
         return out
 
     def list_pods_by_node(self):
-        out = {}
+        out = {
+            'Unknown': []
+        }
         try:
             nodes = self.list_nodes()
             pods = self.list_pods()
@@ -138,7 +140,7 @@ def list_pods_by_node(self):
             out[node['metadata']['name']] = []
 
         for pod in pods:
-            node = pod['spec'].get('node_name', 'Unknown')
+            node = pod['spec'].get('node_name', 'Unknown') or 'Unknown'
             out[node].append(pod)
 
         return out

diff --git a/kqueen/models.py b/kqueen/models.py
@@ -112,8 +112,8 @@ def status(self):
                 'services': kubernetes.list_services(),
                 'version': kubernetes.get_version(),
             }
-
-        except Exception:
+        except Exception as e:
+            logger.exception(e)
             out = {}
 
         return out