feat(controller): add STACK support

Author: duanhongyi

Makefile

@@ -43,7 +43,7 @@ commit-hook:
 	cp _scripts/util/commit-msg .git/hooks/commit-msg
 
 full-clean: check-docker
-	docker images -q $(IMAGE_PREFIX)$(COMPONENT) | xargs docker rmi -f
+	docker images -q $(IMAGE_PREFIX)/$(COMPONENT) | xargs docker rmi -f
 
 test: test-style test-unit test-functional
 

charts/controller/templates/controller-deployment.yaml

@@ -73,11 +73,6 @@ spec:
               value: "{{ .Values.global.registry_location }}"
             - name: "DRYCC_REGISTRY_SECRET_PREFIX"
               value: "{{ .Values.global.secret_prefix }}"
-            - name: "SLUGRUNNER_IMAGE_NAME"
-              valueFrom:
-                configMapKeyRef:
-                  name: slugrunner-config
-                  key: image
             - name: "IMAGE_PULL_POLICY"
               value: "{{ .Values.app_pull_policy }}"
             - name: "TZ"
@@ -137,7 +132,13 @@ spec:
           volumeMounts:
             - mountPath: /var/run/docker.sock
               name: docker-socket
+            - mountPath: /etc/slugbuilder
+              name: slugrunner-config
+              readOnly: true
       volumes:
         - name: docker-socket
           hostPath:
             path: /var/run/docker.sock
+        - name: slugrunner-config
+          configMap:
+            name: slugrunner-config

rootfs/api/migrations/0030_build_stack.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-04-02 01:57
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0029_tls_certs_auto_enabled'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='build',
+            name='stack',
+            field=models.CharField(max_length=32),
+        ),
+    ]

rootfs/api/models/app.py

@@ -497,7 +497,11 @@ def _scale_pods(self, scale_types):
         app_settings = self.appsettings_set.latest()
 
         # use slugrunner image for app if buildpack app otherwise use normal image
-        image = settings.SLUGRUNNER_IMAGE if release.build.type == 'buildpack' else release.image
+        if release.build.type == 'buildpack':
+            image = next(filter(lambda item: item['name'] == release.build.stack,
+                                settings.SLUGRUNNER_IMAGES))['image']
+        else:
+            image = release.image
 
         tasks = []
         for scale_type, replicas in scale_types.items():
@@ -582,7 +586,11 @@ def deploy(self, release, force_deploy=False, rollback_on_failure=True):  # noqa
         self._check_deployment_in_progress(deploys, force_deploy)
 
         # use slugrunner image for app if buildpack app otherwise use normal image
-        image = settings.SLUGRUNNER_IMAGE if release.build.type == 'buildpack' else release.image
+        if release.build.type == 'buildpack':
+            image = next(filter(lambda item: item['name'] == release.build.stack,
+                                settings.SLUGRUNNER_IMAGES))['image']
+        else:
+            image = release.image
 
         try:
             # create the application config in k8s (secret in this case) for all deploy objects
@@ -809,7 +817,11 @@ def pod_name(size=5, chars=string.ascii_lowercase + string.digits):
 
         app_settings = self.appsettings_set.latest()
         # use slugrunner image for app if buildpack app otherwise use normal image
-        image = settings.SLUGRUNNER_IMAGE if release.build.type == 'buildpack' else release.image
+        if release.build.type == 'buildpack':
+            image = next(filter(lambda item: item['name'] == release.build.stack,
+                                settings.SLUGRUNNER_IMAGES))['image']
+        else:
+            image = release.image
 
         data = self._gather_app_settings(release, app_settings, process_type='run', replicas=1)
 

rootfs/api/models/build.py

@@ -17,6 +17,7 @@ class Build(UuidAuditedModel):
     owner = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.PROTECT)
     app = models.ForeignKey('App', on_delete=models.CASCADE)
     image = models.TextField()
+    stack = models.CharField(max_length=32)
 
     # optional fields populated by builder
     sha = models.CharField(max_length=40, blank=True)

rootfs/api/serializers.py

@@ -192,8 +192,8 @@ class BuildSerializer(serializers.ModelSerializer):
     class Meta:
         """Metadata options for a :class:`BuildSerializer`."""
         model = models.Build
-        fields = ['owner', 'app', 'image', 'sha', 'procfile', 'dockerfile', 'created',
-                  'updated', 'uuid']
+        fields = ['owner', 'app', 'image', 'stack', 'sha', 'procfile',
+                  'dockerfile', 'created', 'updated', 'uuid']
 
     def validate_procfile(self, data):
         for key, value in data.items():

rootfs/api/settings/production.py

@@ -5,6 +5,7 @@
 import os.path
 import tempfile
 import ldap
+import json
 
 from django_auth_ldap.config import LDAPSearch, GroupOfNamesType
 
@@ -266,7 +267,20 @@
 PLATFORM_DOMAIN = os.environ.get('DRYCC_PLATFORM_DOMAIN', 'local.drycc.cc')
 
 # k8s image policies
-SLUGRUNNER_IMAGE = os.environ.get('SLUGRUNNER_IMAGE_NAME', 'quay.io/drycc/slugrunner:canary')  # noqa
+if os.path.exists('/etc/slugrunner/images.json'):
+    with open('/etc/slugrunner/images.json') as fb:
+        SLUGRUNNER_IMAGES = json.load(fb)
+else:
+    SLUGRUNNER_IMAGES = [
+        {
+            "name": 'heroku-18',
+            "image": 'drycc/slugrunner:canary.heroku-18',
+        },
+        {
+            "name": 'heroku-16',
+            "image": 'drycc/slugrunner:canary.heroku-16',
+        },
+    ]
 IMAGE_PULL_POLICY = os.environ.get('IMAGE_PULL_POLICY', "IfNotPresent")  # noqa
 
 # True, true, yes, y and more evaluate to True

rootfs/api/tests/test_app.py

@@ -290,7 +290,7 @@ def test_run(self, mock_requests):
         app_id = self.create_app()
 
         # create build
-        body = {'image': 'autotest/example'}
+        body = {'image': 'autotest/example', 'stack': 'container'}
         url = '/v2/apps/{app_id}/builds'.format(**locals())
         response = self.client.post(url, body)
         self.assertEqual(response.status_code, 201, response.data)
@@ -313,7 +313,7 @@ def test_run_failure(self, mock_requests):
         app_id = self.create_app()
 
         # create build
-        body = {'image': 'autotest/example'}
+        body = {'image': 'autotest/example', 'stack': 'container'}
         url = '/v2/apps/{app_id}/builds'.format(**locals())
         response = self.client.post(url, body)
         self.assertEqual(response.status_code, 201, response.data)
@@ -507,7 +507,7 @@ def test_app_verify_application_health_success(self, mock_requests):
 
         # deploy app to get verification
         url = "/v2/apps/{}/builds".format(app_id)
-        body = {'image': 'autotest/example'}
+        body = {'image': 'autotest/example', 'stack': 'container'}
         response = self.client.post(url, body)
         self.assertEqual(response.status_code, 201, response.data)
         self.assertEqual(response.data['image'], body['image'])
@@ -541,7 +541,7 @@ def test_app_verify_application_health_failure_404(self, mock_requests):
 
         # deploy app to get verification
         url = "/v2/apps/{}/builds".format(app_id)
-        body = {'image': 'autotest/example'}
+        body = {'image': 'autotest/example', 'stack': 'container'}
         response = self.client.post(url, body)
         self.assertEqual(response.status_code, 201, response.data)
         self.assertEqual(response.data['image'], body['image'])
@@ -566,7 +566,7 @@ def _raise_exception(request, ctx):
 
         # deploy app to get verification
         url = "/v2/apps/{}/builds".format(app_id)
-        body = {'image': 'autotest/example'}
+        body = {'image': 'autotest/example', 'stack': 'container'}
         response = self.client.post(url, body)
         self.assertEqual(response.status_code, 201, response.data)
         self.assertEqual(response.data['image'], body['image'])
@@ -659,7 +659,7 @@ def test_build_env_vars(self, mock_requests):
         # Make sure an exception is raised when calling without a build available
         with self.assertRaises(DryccException):
             app._build_env_vars(app.release_set.latest())
-        data = {'image': 'autotest/example'}
+        data = {'image': 'autotest/example', 'stack': 'heroku-18'}
         url = "/v2/apps/{app.id}/builds".format(**locals())
         response = self.client.post(url, data)
         self.assertEqual(response.status_code, 201, response.data)
@@ -697,7 +697,7 @@ def test_build_env_vars(self, mock_requests):
     def test_gather_app_settings(self, mock_requests):
         app = App.objects.create(owner=self.user)
         app.save()
-        data = {'image': 'autotest/example'}
+        data = {'image': 'autotest/example', 'stack': 'container'}
         url = "/v2/apps/{app.id}/builds".format(**locals())
         response = self.client.post(url, data)
         self.assertEqual(response.status_code, 201, response.data)
@@ -734,7 +734,7 @@ def test_app_name_bad_regex(self, mock_requests):
 
         # deploy to an app that doesn't exist should fail with 404
         url = "/v2/apps/{}/builds".format('={}'.format(app_id))
-        body = {'image': 'autotest/example'}
+        body = {'image': 'autotest/example', 'stack': 'container'}
         response = self.client.post(url, body)
         self.assertEqual(response.status_code, 404, response)