Merge pull request #961 from kmala/fix

fix(health):Add healthchecks only for routable apps or proctypes

Author: kmala

rootfs/scheduler/__init__.py

@@ -585,19 +585,23 @@ def _set_container(self, namespace, container_name, data, **kwargs):
             data["resources"]["limits"]["cpu"] = cpu.lower()
 
         # add in healthchecks
-        healthchecks = kwargs.get('healthcheck', None)
-        if healthchecks and kwargs.get('routable', False):
-            # check if a port is present. if not, auto-populate it
-            # TODO: rip this out when we stop supporting deis config:set HEALTHCHECK_URL
-            if (
-                healthchecks.get('livenessProbe') is not None and
-                healthchecks['livenessProbe'].get('httpGet') is not None and
-                healthchecks['livenessProbe']['httpGet'].get('port') is None
-            ):
-                healthchecks['livenessProbe']['httpGet']['port'] = env['PORT']
-            data.update(healthchecks)
-        else:
-            self._default_readiness_probe(data, kwargs.get('build_type'), env.get('PORT', None))
+        self._set_health_checks(data, env, kwargs)
+
+    def _set_health_checks(self, container, env, kwargs):
+        if kwargs.get('routable', False):
+            healthchecks = kwargs.get('healthcheck', None)
+            if healthchecks:
+                # check if a port is present. if not, auto-populate it
+                # TODO: rip this out when we stop supporting deis config:set HEALTHCHECK_URL
+                if (
+                    healthchecks.get('livenessProbe') is not None and
+                    healthchecks['livenessProbe'].get('httpGet') is not None and
+                    healthchecks['livenessProbe']['httpGet'].get('port') is None
+                ):
+                    healthchecks['livenessProbe']['httpGet']['port'] = env['PORT']
+                container.update(healthchecks)
+            else:
+                self._default_readiness_probe(container, kwargs.get('build_type'), env.get('PORT', None))  # noqa
 
     def _get_private_registry_config(self, registry, image):
         secret_name = settings.REGISTRY_SECRET_PREFIX

rootfs/scheduler/tests/test_scheduler.py

@@ -35,12 +35,39 @@ def test_set_container_applies_healthcheck_with_routable(self):
                 }
             }
         }
+        readinessHealthCheck = {
+                # an exec probe
+                'exec': {
+                    "command": [
+                        "bash",
+                        "-c",
+                        "[[ '$(ps -p 1 -o args)' != *'bash /runner/init'* ]]"
+                    ]
+                },
+                # length of time to wait for a pod to initialize
+                # after pod startup, before applying health checking
+                'initialDelaySeconds': 30,
+                'timeoutSeconds': 5,
+                'periodSeconds': 5,
+                'successThreshold': 1,
+                'failureThreshold': 1,
+            }
+
         self.scheduler_client._set_container('foo',
                                              'bar',
                                              data,
                                              routable=True,
                                              healthcheck=healthcheck)
         self.assertDictContainsSubset(healthcheck, data)
+        data = {}
+        self.scheduler_client._set_container('foo',
+                                             'bar',
+                                             data,
+                                             routable=True,
+                                             build_type="buildpack",
+                                             healthcheck={})
+        self.assertEqual(data.get('livenessProbe'), None)
+        self.assertEqual(data.get('readinessProbe'), readinessHealthCheck)
         # clear the dict to call again with routable as false
         data = {}
         self.scheduler_client._set_container('foo',
@@ -49,13 +76,15 @@ def test_set_container_applies_healthcheck_with_routable(self):
                                              routable=False,
                                              healthcheck=healthcheck)
         self.assertEqual(data.get('livenessProbe'), None)
+        self.assertEqual(data.get('readinessProbe'), None)
         # now call without setting 'routable', should default to False
         data = {}
         self.scheduler_client._set_container('foo',
                                              'bar',
                                              data,
                                              healthcheck=healthcheck)
         self.assertEqual(data.get('livenessProbe'), None)
+        self.assertEqual(data.get('readinessProbe'), None)
 
     def test_set_container_limits(self):
         """