Final logic for the lifecycle hooks

Author: Cryptophobia

Makefile

@@ -33,7 +33,7 @@ docker-build: check-docker
 docker-build-test: check-docker
 	docker build ${DOCKER_BUILD_FLAGS} -t ${IMAGE}.test -f rootfs/Dockerfile.test rootfs
 
-deploy: docker-build docker-push
+deploy: check-kubectl docker-build docker-push
 	kubectl --namespace=deis patch deployment deis-$(COMPONENT) --type='json' -p='[{"op": "replace", "path": "/spec/template/spec/containers/0/image", "value":"$(IMAGE)"}]'
 
 clean: check-docker

rootfs/api/models/release.py

@@ -441,17 +441,17 @@ def save(self, *args, **kwargs):  # noqa
                         self.summary += ' and '
                     self.summary += "{} {}".format(self.config.owner, changes)
 
-                # if the lifecycle_post_start hooks changed, log the dict diff
+                # if the lifecycle_pre_stop hooks changed, log the dict diff
                 changes = []
-                old_lifecycle_post_start = old_config.lifecycle_post_start if old_config else {}
-                diff = dict_diff(self.config.lifecycle_post_start, old_lifecycle_post_start)
+                old_lifecycle_pre_stop = old_config.lifecycle_pre_stop if old_config else {}
+                diff = dict_diff(self.config.lifecycle_pre_stop, old_lifecycle_pre_stop)
                 # try to be as succinct as possible
                 added = ', '.join(k for k in diff.get('added', {}))
-                added = 'added lifecycle_post_start  ' + added if added else ''
+                added = 'added lifecycle_pre_stop  ' + added if added else ''
                 changed = ', '.join(k for k in diff.get('changed', {}))
-                changed = 'changed lifecycle_post_start ' + changed if changed else ''
+                changed = 'changed lifecycle_pre_stop ' + changed if changed else ''
                 deleted = ', '.join(k for k in diff.get('deleted', {}))
-                deleted = 'deleted lifecycle_post_start ' + deleted if deleted else ''
+                deleted = 'deleted lifecycle_pre_stop ' + deleted if deleted else ''
                 changes = ', '.join(i for i in (added, changed, deleted) if i)
                 if changes:
                     if self.summary:

rootfs/scheduler/resources/pod.py

@@ -224,6 +224,8 @@ def _set_container(self, namespace, container_name, data, **kwargs):
 
         self._set_health_checks(data, env, **kwargs)
 
+        self._set_lifecycle_hooks(data, env, **kwargs)
+
     def _set_resources(self, container, kwargs):
         """ Set CPU/memory resource management manifest """
         app_type = kwargs.get("app_type")
@@ -278,6 +280,38 @@ def _set_health_checks(self, container, env, **kwargs):
         elif kwargs.get('routable', False):
             self._default_readiness_probe(container, kwargs.get('build_type'), env.get('PORT', None))  # noqa
 
+    def _set_lifecycle_hooks(self, container, env, **kwargs):
+        app_type = kwargs.get("app_type")
+        lifecycle_post_start = kwargs.get('lifecycle_post_start', {})
+        lifecycle_post_start = lifecycle_post_start.get(app_type)
+        lifecycle_pre_stop = kwargs.get('lifecycle_pre_stop', {})
+        lifecycle_pre_stop = lifecycle_pre_stop.get(app_type)
+        lifecycle = defaultdict(dict)
+        if lifecycle_post_start or lifecycle_pre_stop:
+            lifecycle = defaultdict(dict)
+
+            if lifecycle_post_start:
+                lifecycle["postStart"] = {               
+                        'exec': {
+                            "command": [
+                                "/bin/bash",
+                                "-c",
+                                "{0}".format(lifecycle_post_start)
+                            ]
+                        }
+                }
+            if lifecycle_pre_stop:
+                lifecycle["preStop"] = {               
+                        'exec': {
+                            "command": [
+                                "/bin/bash",
+                                "-c",
+                                "{0}".format(lifecycle_pre_stop)
+                            ]
+                        }
+                }
+            container["lifecycle"] = dict(lifecycle)
+
     def _default_readiness_probe(self, container, build_type, port=None):
         # Update only the application container with the health check
         if build_type == "buildpack":
@@ -345,6 +379,15 @@ def _default_dockerapp_readiness_probe(self, port, delay=5, timeout=5, period_se
         }
         return readinessprobe
 
+    def _set_custom_termination_period(self, container, period_seconds=900):
+        """
+        Applies a custom terminationGracePeriod only if provided as env variable.
+        """
+        terminationperiod = {
+            'terminationGracePeriodSeconds': int(period_seconds)
+        }
+        container.update(terminationperiod)
+
     def delete(self, namespace, name):
         # get timeout info from pod
         pod = self.pod.get(namespace, name).json()