Merge pull request #578 from helgi/ticket_571

fix(scheduler): only update port on routable services

Author: helgi

rootfs/api/models/app.py

@@ -1,3 +1,4 @@
+from collections import OrderedDict
 from datetime import datetime
 import logging
 import random
@@ -341,31 +342,33 @@ def deploy(self, user, release):
             self.save()
 
         # deploy application to k8s. Also handles initial scaling
+        deploys = {}
         build_type = app_build_type(release)
         for scale_type in self.structure.keys():
-            image = release.image
-            version = "v{}".format(release.version)
-            kwargs = {
+            deploys[scale_type] = {
                 'memory': release.config.memory,
                 'cpu': release.config.cpu,
                 'tags': release.config.tags,
                 'envs': release.config.values,
                 'replicas': 0,  # Scaling up happens in a separate operation
-                'version': version,
+                'version': "v{}".format(release.version),
                 'app_type': scale_type,
                 'build_type': build_type,
                 'healthcheck': release.config.healthcheck(),
                 # http://docs.deis.io/en/latest/using_deis/process-types/#web-vs-cmd-process-types
                 'routable': True if scale_type in ['web', 'cmd'] else False
             }
 
-            command = self._get_command(scale_type)
+        # Sort deploys so routable comes first
+        deploys = OrderedDict(sorted(deploys.items(), key=lambda d: d[1].get('routable')))
+
+        for scale_type, kwargs in deploys.items():
             try:
                 self._scheduler.deploy(
                     namespace=self.id,
                     name=self._get_job_id(scale_type),
-                    image=image,
-                    command=command,
+                    image=release.image,
+                    command=self._get_command(scale_type),
                     **kwargs
                 )
 

rootfs/scheduler/__init__.py

@@ -395,7 +395,7 @@ def deploy(self, namespace, name, image, command, **kwargs):
         # traffic to the application
         self._update_application_service(namespace, name, app_type, image, routable)
 
-    def _update_application_service(self, namespace, name, app_type, image, routable):
+    def _update_application_service(self, namespace, name, app_type, image, routable=False):
         """Update application service with all the various required information"""
         try:
             # Fetch service
@@ -411,11 +411,12 @@ def _update_application_service(self, namespace, name, app_type, image, routable
                 service['spec']['selector']['type'] = app_type
 
             # Find if target port exists already, update / create as required
-            port = self._get_port(image)
-            for pos, item in enumerate(service['spec']['ports']):
-                if item['port'] == 80 and port != item['targetPort']:
-                    # port 80 is the only one we care about right now
-                    service['spec']['ports'][pos]['targetPort'] = port
+            if routable:
+                port = self._get_port(image)
+                for pos, item in enumerate(service['spec']['ports']):
+                    if item['port'] == 80 and port != item['targetPort']:
+                        # port 80 is the only one we care about right now
+                        service['spec']['ports'][pos]['targetPort'] = port
 
             self._update_service(namespace, namespace, data=service)
         except Exception as e: