Merge pull request #869 from helgi/remove_get_rc_status

ref(scheduler): remove get_rc_status in favour of using built in handling

Author: helgi

rootfs/scheduler/__init__.py

@@ -229,15 +229,18 @@ def _update_application_service(self, namespace, name, app_type, port, routable=
     def scale(self, namespace, name, image, command, **kwargs):
         logger.info('scale {}, img {}, cmd "{}"'.format(name, image, command))
         replicas = kwargs.pop('replicas')
-        if unhealthy(self.get_rc_status(namespace, name)):
-            # add RC if it is missing for the namespace
-            try:
-                # Create RC with scale as 0 and then scale to get pod monitoring
-                kwargs['replicas'] = 0
-                self.create_rc(namespace, name, image, command, **kwargs)
-            except KubeException:
-                logger.exception("Creating RC {} failed}".format(name))
-                raise
+        try:
+            self.get_rc(namespace, name)
+        except KubeHTTPException as e:
+            if e.response.status_code == 404:
+                # add RC if it is missing for the namespace
+                try:
+                    # Create RC with scale as 0 and then scale to get pod monitoring
+                    kwargs['replicas'] = 0
+                    self.create_rc(namespace, name, image, command, **kwargs)
+                except KubeException:
+                    logger.exception("Creating RC {} failed".format(name))
+                    raise
 
         # let the scale failure bubble up
         self._scale_rc(namespace, name, replicas)
@@ -708,11 +711,6 @@ def get_old_rc(self, namespace, app_type):
 
         return controllers['items'][0]
 
-    def get_rc_status(self, namespace, name):
-        url = self._api("/namespaces/{}/replicationcontrollers/{}", namespace, name)
-        resp = self.session.get(url)
-        return resp.status_code
-
     def get_rc(self, namespace, name):
         url = self._api("/namespaces/{}/replicationcontrollers/{}", namespace, name)
         response = self.session.get(url)