Merge pull request #437 from helgi/fetch_all

feat(scheduler): add more functions to fetch on the global endpoints for various resources

Author: helgi

rootfs/scheduler/__init__.py

@@ -472,7 +472,7 @@ def run(self, name, image, entrypoint, command):
                 status, reason, data = self._get_pod(name, appname)
                 parsed_json = json.loads(data)
                 if parsed_json['status']['phase'] == 'Succeeded':
-                    status, data, reason = self._pod_log(name, appname)
+                    data = self._pod_log(appname, name).text
                     self._delete_pod(name, appname)
                     return 0, data
                 if parsed_json['status']['phase'] == 'Running':
@@ -596,6 +596,14 @@ def _get_namespace_events(self, namespace, **kwargs):
 
         return response
 
+    def _get_namespace(self, namespace):
+        url = self._api("/namespaces/{}/", namespace)
+        response = self.session.get(url)
+        if unhealthy(response.status_code):
+            error(response, 'get Namespace "{}"', namespace)
+
+        return response
+
     def _create_namespace(self, app_name):
         url = self._api("/namespaces")
         data = {
@@ -626,8 +634,12 @@ def _get_old_rc(self, name, app_type):
         exists = False
         prev_rc = []
         for rc in resp.json()['items']:
-            if('app' in rc['spec']['selector'] and name == rc['metadata']['labels']['app'] and
-               'type' in rc['spec']['selector'] and app_type == rc['spec']['selector']['type']):
+            if (
+                'app' in rc['spec']['selector'] and
+                name == rc['metadata']['labels']['app'] and
+                'type' in rc['spec']['selector'] and
+                app_type == rc['spec']['selector']['type']
+            ):
                 exists = True
                 prev_rc = rc
                 break
@@ -649,6 +661,14 @@ def _get_rc(self, name, namespace):
 
         return resp.json()
 
+    def _get_rcs(self, namespace, **kwargs):
+        url = self._api("/namespaces/{}/replicationcontrollers/{}", namespace)
+        response = self.session.get(url, params=self._selectors(**kwargs))
+        if unhealthy(response.status_code):
+            error(response, 'get ReplicationControllers in Namespace "{}"', namespace)
+
+        return response
+
     def _get_schedule_status(self, namespace, name, current, desired, resource_version):  # noqa
         if int(desired) > int(current):
             # new pods are going to be scheduled
@@ -995,6 +1015,14 @@ def _get_secret(self, namespace, name):
 
         return response
 
+    def _get_secrets(self, namespace, **kwargs):
+        url = self._api('/namespaces/{}/secrets', namespace)
+        response = self.session.get(url, params=self._selectors(**kwargs))
+        if unhealthy(response.status_code):
+            error(response, 'get Secrets in Namespace "{}"', namespace)
+
+        return response
+
     def _create_secret(self, namespace, name, data):
         template = json.loads(string.Template(SECRET_TEMPLATE).substitute({
             "version": self.apiversion,
@@ -1032,6 +1060,14 @@ def _get_service(self, name, namespace):
 
         return response
 
+    def _get_services(self, namespace, **kwargs):
+        url = self._api('/namespaces/{}/services', namespace)
+        response = self.session.get(url, params=self._selectors(**kwargs))
+        if unhealthy(response.status_code):
+            error(response, 'get Services in Namespace "{}"', namespace)
+
+        return response
+
     def _create_service(self, name, app_name, app_type, data={}, **kwargs):
         port = self._get_port(kwargs.get('image'))
         l = {
@@ -1106,13 +1142,13 @@ def _delete_pod(self, name, namespace):
             if e.response.status_code != 404:
                 error(e.response, 'delete Pod "{}" in Namespace "{}"', name, namespace)
 
-    def _pod_log(self, name, namespace):
+    def _pod_log(self, namespace, name):
         url = self._api("/namespaces/{}/pods/{}/log", namespace, name)
-        resp = self.session.get(url)
-        if unhealthy(resp.status_code):
-            error(resp, 'get logs for Pod "{}" in Namespace "{}"', name, namespace)
+        response = self.session.get(url)
+        if unhealthy(response.status_code):
+            error(response, 'get logs for Pod "{}" in Namespace "{}"', name, namespace)
 
-        return resp.status_code, resp.text, resp.reason
+        return response
 
     def _pod_readiness_status(self, pod):
         """Check if the pod container have passed the readiness probes"""
@@ -1143,23 +1179,8 @@ def _pod_liveness_status(self, pod):
     # NODES #
 
     def _get_nodes(self, **kwargs):
-        path = '/nodes'
-        query = {}
-
-        # labels and fields are encoded slightly differently than python-requests can do
-        labels = kwargs.get('labels', {})
-        if labels:
-            # http://kubernetes.io/v1.1/docs/user-guide/labels.html#list-and-watch-filtering
-            labels = ['{}={}'.format(key, value) for key, value in labels.items()]
-            query['labelSelector'] = ','.join(labels)
-
-        fields = kwargs.get('fields', {})
-        if fields:
-            fields = ['{}={}'.format(key, value) for key, value in fields.items()]
-            query['fieldSelector'] = ','.join(fields)
-
-        url = self._api(path)
-        response = self.session.get(url, params=query)
+        url = self._api('/nodes')
+        response = self.session.get(url, params=self._selectors(**kwargs))
         if unhealthy(response.status_code):
             error(response, 'get Nodes')