Merge pull request #942 from helgi/deployments_only

ref(*): make Deployments the only deploy strategy, no RC

Author: helgi

rootfs/api/models/app.py

@@ -123,17 +123,7 @@ def __str__(self):
 
     def _get_job_id(self, container_type):
         app = self.id
-        release = self.release_set.latest()
-
-        # see if there is a global or app specific setting to specify Deployments usage
-        deployments = bool(release.config.values.get('DEIS_KUBERNETES_DEPLOYMENTS', settings.DEIS_KUBERNETES_DEPLOYMENTS))  # noqa
-
-        # deployments does not need version in the job
-        if deployments:
-            return "{app}-{container_type}".format(**locals())
-
-        version = "v{}".format(release.version)
-        return "{app}-{version}-{container_type}".format(**locals())
+        return "{app}-{container_type}".format(**locals())
 
     def _get_command(self, container_type):
         """
@@ -259,34 +249,17 @@ def restart(self, **kwargs):  # noqa
         Wait until they are all drained away and RC / Deployment has gotten to a good state
         """
         try:
-            if kwargs.get('release', None) is None:
-                release = self.release_set.latest()
-            else:
-                release = self.release_set.get(version=kwargs['release'])
-
-            # see if there is a global or app specific setting to specify Deployments usage
-            deployments = bool(release.config.values.get('DEIS_KUBERNETES_DEPLOYMENTS', settings.DEIS_KUBERNETES_DEPLOYMENTS))  # noqa
-
-            if deployments:
-                # Resolve single pod name if short form (cmd-1269180282-1nyfz) is passed
-                if 'name' in kwargs and kwargs['name'].count('-') == 2:
-                    kwargs['name'] = '{}-{}'.format(kwargs['id'], kwargs['name'])
-            else:
-                # Resolve single pod name if short form (worker-asdfg) is passed
-                if 'name' in kwargs and kwargs['name'].count('-') == 1:
-                    version = "v{}".format(release.version)
-                    kwargs['name'] = '{}-{}-{}'.format(kwargs['id'], version, kwargs['name'])
+            # Resolve single pod name if short form (cmd-1269180282-1nyfz) is passed
+            if 'name' in kwargs and kwargs['name'].count('-') == 2:
+                kwargs['name'] = '{}-{}'.format(kwargs['id'], kwargs['name'])
 
             # Iterate over RCs / RSs to get total desired count if not a single item
             desired = 1
             if 'name' not in kwargs:
                 desired = 0
                 labels = self._scheduler_filter(**kwargs)
-                # fetch RS (which represent Deployments) / RCs
-                if deployments:
-                    controllers = self._scheduler.get_replicasets(kwargs['id'], labels=labels)
-                else:
-                    controllers = self._scheduler.get_rcs(kwargs['id'], labels=labels)
+                # fetch RS (which represent Deployments)
+                controllers = self._scheduler.get_replicasets(kwargs['id'], labels=labels)
 
                 for controller in controllers.json()['items']:
                     desired += controller['spec']['replicas']
@@ -424,9 +397,6 @@ def _scale_pods(self, scale_types):
         # see if the app config has deploy timeout preference, otherwise use global
         deploy_timeout = release.config.values.get('DEIS_DEPLOY_TIMEOUT', settings.DEIS_DEPLOY_TIMEOUT)  # noqa
 
-        # see if there is a global or app specific setting to specify Deployments usage
-        deployments = bool(envs.get('DEIS_KUBERNETES_DEPLOYMENTS', settings.DEIS_KUBERNETES_DEPLOYMENTS))  # noqa
-
         tasks = []
         for scale_type, replicas in scale_types.items():
             # only web / cmd are routable
@@ -449,7 +419,6 @@ def _scale_pods(self, scale_types):
                 'build_type': release.build.type,
                 'healthcheck': release.config.healthcheck,
                 'routable': routable,
-                'deployments': deployments,
                 'deploy_batches': batches,
                 'deploy_timeout': deploy_timeout,
             }
@@ -493,9 +462,6 @@ def deploy(self, release, force_deploy=False):
         # see if the app config has deploy batch preference, otherwise use global
         batches = release.config.values.get('DEIS_DEPLOY_BATCHES', settings.DEIS_DEPLOY_BATCHES)
 
-        # see if there is a global or app specific setting to specify Deployments usage
-        deployments = bool(release.config.values.get('DEIS_KUBERNETES_DEPLOYMENTS', settings.DEIS_KUBERNETES_DEPLOYMENTS))  # noqa
-
         # see if the app config has deploy timeout preference, otherwise use global
         deploy_timeout = release.config.values.get('DEIS_DEPLOY_TIMEOUT', settings.DEIS_DEPLOY_TIMEOUT)  # noqa
 
@@ -529,7 +495,6 @@ def deploy(self, release, force_deploy=False):
                 'deploy_batches': batches,
                 'deploy_timeout': deploy_timeout,
                 'deployment_history_limit': deployment_history,
-                'deployments': deployments,
                 'release_summary': release.summary
             }
 
@@ -570,7 +535,7 @@ def deploy(self, release, force_deploy=False):
             self.verify_application_health(**kwargs)
 
         # cleanup old release objects from kubernetes
-        release.cleanup_old(deployments)
+        release.cleanup_old()
 
     def _default_structure(self, release):
         """Scale to default structure based on release type"""

rootfs/api/models/release.py

@@ -246,7 +246,7 @@ def delete(self, *args, **kwargs):
         finally:
             super(Release, self).delete(*args, **kwargs)
 
-    def cleanup_old(self, deployment=False):
+    def cleanup_old(self):
         """Cleanup all but the latest release from Kubernetes"""
         latest_version = 'v{}'.format(self.version)
         self.app.log(
@@ -307,8 +307,7 @@ def cleanup_old(self, deployment=False):
 
             self._scheduler.delete_pod(self.app.id, pod['metadata']['name'])
 
-        if deployment:
-            self._cleanup_deployment_secrets_and_configs(self.app.id)
+        self._cleanup_deployment_secrets_and_configs(self.app.id)
 
     def _cleanup_deployment_secrets_and_configs(self, namespace):
         """
@@ -374,11 +373,6 @@ def _delete_release_in_scheduler(self, namespace, version):
             pass
 
     def deployment_in_progress(self, namespace, name):
-        # see if there is a global or app specific setting to specify Deployments usage
-        deployments = bool(self.config.values.get('DEIS_KUBERNETES_DEPLOYMENTS', settings.DEIS_KUBERNETES_DEPLOYMENTS))  # noqa
-        if not deployments:
-            return False
-
         try:
             ready, _ = self._scheduler.are_deployment_replicas_ready(namespace, name)
             return not ready

rootfs/api/settings/production.py

@@ -270,9 +270,6 @@
 # where it roughly goes BATCHES * TIMEOUT = global timeout
 DEIS_DEPLOY_TIMEOUT = os.environ.get('DEIS_DEPLOY_TIMEOUT', 120)
 
-# If the k8s Deployments object should be used instead of ReplicationController
-DEIS_KUBERNETES_DEPLOYMENTS = bool(os.environ.get('DEIS_KUBERNETES_DEPLOYMENTS', False))
-
 KUBERNETES_DEPLOYMENTS_REVISION_HISTORY_LIMIT = os.environ.get('KUBERNETES_DEPLOYMENTS_REVISION_HISTORY_LIMIT', None)  # noqa
 
 # How long k8s waits for a pod to finish work after a SIGTERM before sending SIGKILL