Merge pull request #515 from smothiki/mute

feat(slugrunner): make slugrunner configurable via env variables

Author: Sivaram Mothiki

rootfs/deis/settings.py

@@ -262,6 +262,8 @@
 random_secret = 'CHANGEME_sapm$s%upvsw5l_zuy_&29rkywd^78ff(qi*#@&*^'
 SECRET_KEY = os.environ.get('DEIS_SECRET_KEY', random_secret)
 BUILDER_KEY = os.environ.get('DEIS_BUILDER_KEY', random_secret)
+defaultImage = "quay.io/deisci/slugrunner:canary"
+SLUGRUNNER_IMAGE = os.environ.get('SLUGRUNNER_IMAGE_NAME', defaultImage)
 
 # registry settings
 REGISTRY_HOST = os.environ.get('DEIS_REGISTRY_SERVICE_HOST', '127.0.0.1')

rootfs/scheduler/__init__.py

@@ -28,7 +28,7 @@
     "containers": [
       {
         "name": "$id",
-        "image": "quay.io/deisci/slugrunner:v2-beta",
+        "image": "$slugimage",
         "env": [
         {
             "name":"PORT",
@@ -172,7 +172,7 @@
         "containers": [
           {
             "name": "$containername",
-            "image": "quay.io/deisci/slugrunner:v2-beta",
+            "image": "$slugimage",
             "imagePullPolicy": "Always",
             "env": [
             {
@@ -469,14 +469,18 @@ def run(self, name, image, entrypoint, command, **kwargs):
         name = name.replace('.', '-').replace('_', '-')
         imgurl = self.registry + '/' + image
         POD = POD_TEMPLATE
-        if image.startswith('http://') or image.startswith('https://'):
-            POD = POD_BTEMPLATE
-            imgurl = image
+
         l = {
             'id': name,
             'version': self.apiversion,
             'image': imgurl,
         }
+
+        if image.startswith('http://') or image.startswith('https://'):
+            POD = POD_BTEMPLATE
+            l["image"] = image
+            l["slugimage"] = settings.SLUGRUNNER_IMAGE
+
         template = string.Template(POD).substitute(l)
         if command.startswith('-c '):
             args = command.split(' ', 1)
@@ -846,11 +850,6 @@ def _create_rc(self, namespace, name, image, command, **kwargs):  # noqa
         imgurl = self.registry + "/" + image
         TEMPLATE = RCD_TEMPLATE
 
-        # Check if it is a slug builder image.
-        if kwargs.get('build_type') == "buildpack":
-            imgurl = image
-            TEMPLATE = RCB_TEMPLATE
-
         l = {
             "name": name,
             "id": namespace,
@@ -861,6 +860,13 @@ def _create_rc(self, namespace, name, image, command, **kwargs):  # noqa
             "containername": container_name,
             "type": app_type,
         }
+
+        # Check if it is a slug builder image.
+        if kwargs.get('build_type') == "buildpack":
+            l["image"] = image
+            l["slugimage"] = settings.SLUGRUNNER_IMAGE
+            TEMPLATE = RCB_TEMPLATE
+
         template = json.loads(string.Template(TEMPLATE).substitute(l))
 
         # apply tags as needed