Merge pull request #591 from helgi/health

feat(config): setting one healthcheck value now results in all defaults for health to be saved

Author: helgi

rootfs/api/models/config.py

@@ -27,16 +27,33 @@ def __str__(self):
         return "{}-{}".format(self.app.id, str(self.uuid)[:7])
 
     def healthcheck(self):
-        # Update healthcheck - Scheduler determines the app type
+        """
+        Get all healthchecks options together for use in scheduler
+        """
+        # return empty dict if no healthcheck is found
         if 'HEALTHCHECK_URL' not in self.values.keys():
             return {}
+
         path = self.values.get('HEALTHCHECK_URL', '/')
         timeout = int(self.values.get('HEALTHCHECK_TIMEOUT', 50))
         delay = int(self.values.get('HEALTHCHECK_INITIAL_DELAY', 50))
-        port = int(self.values.get('HEALTHCHECK_PORT', 8080))
+        port = int(self.values.get('HEALTHCHECK_PORT', 5000))
 
         return {'path': path, 'timeout': timeout, 'delay': delay, 'port': port}
 
+    def set_healthchecks(self):
+        """Defines default values for HTTP healthchecks"""
+        if not {k: v for k, v in self.values.items() if k.startswith('HEALTHCHECK_')}:
+            return
+
+        # fetch set health values and any defaults
+        # this approach allows new health items to be added without issues
+        health = self.healthcheck()
+        self.values['HEALTHCHECK_URL'] = health['path']
+        self.values['HEALTHCHECK_TIMEOUT'] = health['timeout']
+        self.values['HEALTHCHECK_INITIAL_DELAY'] = health['delay']
+        self.values['HEALTHCHECK_PORT'] = health['port']
+
     def save(self, **kwargs):
         """merge the old config with the new"""
         try:
@@ -61,6 +78,9 @@ def save(self, **kwargs):
         except Config.DoesNotExist:
             pass
 
+        # set any missing HEALTHCHECK_* elements
+        self.set_healthchecks()
+
         # verify the tags exist on any nodes as labels
         if self.tags:
             # Get all nodes with label selectors

rootfs/scheduler/__init__.py

@@ -942,7 +942,7 @@ def _create_rc(self, namespace, name, image, command, **kwargs):  # noqa
 
         # add in healtchecks
         if kwargs.get('healthcheck'):
-            template = self._healthcheck(template, **kwargs['healthcheck'])
+            template = self._healthcheck(template, kwargs['routable'], **kwargs['healthcheck'])
 
         url = self._api("/namespaces/{}/replicationcontrollers", namespace)
         resp = self.session.post(url, json=template)
@@ -986,10 +986,8 @@ def _delete_rc(self, namespace, name):
 
         return response
 
-    def _healthcheck(self, controller, path='/', port=8080, delay=30, timeout=1):
-        # FIXME this logic ideally should live higher up
-        app_type = controller['spec']['selector']['type']
-        if app_type not in ['web', 'cmd']:
+    def _healthcheck(self, controller, routable=False, path='/', port=5000, delay=30, timeout=5):  # noqa
+        if not routable:
             return controller
 
         namespace = controller['spec']['selector']['app']
@@ -1029,6 +1027,7 @@ def _healthcheck(self, controller, path='/', port=8080, delay=30, timeout=1):
         }
 
         # Update only the application container with the health check
+        app_type = controller['spec']['selector']['type']
         container_name = '{}-{}'.format(namespace, app_type)
         containers = controller['spec']['template']['spec']['containers']
         for container in containers: