feat(crt): support containerd-ctr

Author: duanhongyi

charts/controller/templates/controller-clusterrole.yaml

@@ -56,5 +56,11 @@ rules:
 - apiGroups: ["certmanager.k8s.io"]
   resources: ["certificates", "issuers"]
   verbs: ["get", "list", "watch", "create", "update", "delete"]
+- apiGroups: ["networking.k8s.io"]
+  resources: ["ingresses"]
+  verbs: ["get", "list", "create", "delete", "deletecollection", "patch", "update"]
+- apiGroups: ["apps"]
+  resources: ["replicasets"]
+  verbs: ["get", "list", "watch"]
 {{- end -}}
 {{- end -}}

charts/controller/templates/controller-deployment.yaml

@@ -130,15 +130,10 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
           volumeMounts:
-            - mountPath: /var/run/docker.sock
-              name: docker-socket
             - mountPath: /etc/slugrunner
               name: slugrunner-config
               readOnly: true
       volumes:
-        - name: docker-socket
-          hostPath:
-            path: /var/run/docker.sock
         - name: slugrunner-config
           configMap:
             name: slugrunner-config

rootfs/api/models/release.py

@@ -3,7 +3,6 @@
 from django.conf import settings
 from django.db import models
 
-from registry import publish_release, get_port as docker_get_port, RegistryException # noqa
 from api.utils import dict_diff
 from api.models import UuidAuditedModel
 from api.exceptions import DryccException, AlreadyExists
@@ -66,7 +65,7 @@ def image(self):
             return '{}/{}:git-{}'.format(settings.REGISTRY_URL, self.app.id, str(self.build.sha))
         elif self.build.type == 'image':
             # Drycc Pull, docker image in local registry
-            return '{}/{}:v{}'.format(settings.REGISTRY_URL, self.app.id, str(self.version))
+            return self.build.image
         elif self.build.type == 'buildpack':
             # Build Pack - Registry URL not prepended since slugrunner image will download slug
             return self.build.image
@@ -81,69 +80,18 @@ def new(self, user, config, build, summary=None, source_version='latest'):
         # construct fully-qualified target image
         new_version = self.app.release_set.latest().version + 1
         # create new release and auto-increment version
-        release = Release.objects.create(
+        return Release.objects.create(
             owner=user, app=self.app, config=config,
             build=build, version=new_version, summary=summary
         )
 
-        try:
-            release.publish()
-        except DryccException as e:
-            # If we cannot publish this app, just log and carry on
-            self.app.log(e)
-            pass
-        except RegistryException as e:
-            self.app.log(e)
-            raise DryccException(str(e)) from e
-
-        return release
-
-    def publish(self):
-        if self.build is None:
-            raise DryccException('No build associated with this release to publish')
-
-        # If the build has a SHA, assume it's from drycc-builder and in the drycc-registry already
-        if self.build.source_based:
-            return
-
-        # Builder pushes to internal registry, exclude SHA based images from being returned early
-        registry = self.config.registry
-        if (
-            registry.get('username', None) and
-            registry.get('password', None) and
-            # SHA means it came from a git push (builder)
-            not self.build.sha and
-            # hostname tells Builder where to push images
-            not registry.get('hostname', None)
-        ) or (settings.REGISTRY_LOCATION != 'on-cluster'):
-            self.app.log('{} exists in the target registry. Using image for release {} of app {}'.format(self.build.image, self.version, self.app))  # noqa
-            return
-
-        # return image if it is already in the registry, test host and then host + port
-        if (
-            self.build.image.startswith(settings.REGISTRY_HOST) or
-            self.build.image.startswith(settings.REGISTRY_URL)
-        ):
-            self.app.log('{} exists in the target registry. Using image for release {} of app {}'.format(self.build.image, self.version, self.app))  # noqa
-            return
-
-        # add tag if it was not provided
-        source_image = self.build.image
-        if ':' not in source_image:
-            source_image = "{}:{}".format(source_image, self.build.version)
-
-        # if build is source based then it was pushed into the drycc registry
-        drycc_registry = bool(self.build.source_based)
-        publish_release(source_image, self.image, drycc_registry, self.get_registry_auth())
-
     def get_port(self):
         """
         Get application port for a given release. If pulling from private registry
         then use default port or read from ENV var, otherwise attempt to pull from
         the docker image
         """
         try:
-            drycc_registry = bool(self.build.source_based)
             envs = self.config.values
             creds = self.get_registry_auth()
 
@@ -165,17 +113,8 @@ def get_port(self):
                 return int(envs.get('PORT'))
 
             # If the user provides PORT
-            if envs.get('PORT', None):
-                return int(envs.get('PORT'))
-
-            # discover port from docker image
-            port = docker_get_port(self.image, drycc_registry, creds)
-            if port is None and self.app.appsettings_set.latest().routable:
-                msg = "Expose a port or make the app non routable by changing the process type"
-                self.app.log(msg, logging.ERROR)
-                raise DryccException(msg)
+            return int(envs.get('PORT', 5000))
 
-            return port
         except Exception as e:
             raise DryccException(str(e)) from e
 

rootfs/api/tests/__init__.py

@@ -9,10 +9,6 @@
 from rest_framework.test import APITestCase, APITransactionTestCase
 
 
-def mock_port(*args, **kwargs):
-    return 5000
-
-
 # Mock out router requests and add in some jitter
 # Used for application is available in router checks
 def fake_responses(request, context):

rootfs/api/tests/test_app.py

@@ -20,7 +20,7 @@
 from scheduler import KubeException, KubeHTTPException
 
 from api.exceptions import DryccException
-from api.tests import adapter, mock_port, DryccTestCase
+from api.tests import adapter, DryccTestCase
 import requests_mock
 
 
@@ -33,8 +33,6 @@ def _mock_run(*args, **kwargs):
 
 
 @requests_mock.Mocker(real_http=True, adapter=adapter)
-@mock.patch('api.models.release.publish_release', lambda *args: None)
-@mock.patch('api.models.release.docker_get_port', mock_port)
 class AppTest(DryccTestCase):
     """Tests creation of applications"""
 
@@ -280,7 +278,6 @@ def test_run_without_release_should_error(self, mock_requests):
 
     @mock.patch('api.models.App.run', _mock_run)
     @mock.patch('api.models.App.deploy', mock_none)
-    @mock.patch('api.models.Release.publish', mock_none)
     def test_run(self, mock_requests):
         """
         A user should be able to run a one off command

rootfs/api/tests/test_app_settings.py

@@ -7,12 +7,10 @@
 from api.models import App
 from unittest import mock
 from scheduler import KubeException
-from api.tests import adapter, mock_port, DryccTransactionTestCase
+from api.tests import adapter, DryccTransactionTestCase
 
 
 @requests_mock.Mocker(real_http=True, adapter=adapter)
-@mock.patch('api.models.release.publish_release', lambda *args: None)
-@mock.patch('api.models.release.docker_get_port', mock_port)
 class TestAppSettings(DryccTransactionTestCase):
     """Tests setting and updating config values"""
 

rootfs/api/tests/test_build.py

@@ -13,16 +13,13 @@
 from rest_framework.authtoken.models import Token
 
 from api.models import Build, App
-from registry.dockerclient import RegistryException
 from scheduler import KubeException
 
-from api.tests import adapter, mock_port, DryccTransactionTestCase
+from api.tests import adapter, DryccTransactionTestCase
 import requests_mock
 
 
 @requests_mock.Mocker(real_http=True, adapter=adapter)
-@mock.patch('api.models.release.publish_release', lambda *args: None)
-@mock.patch('api.models.release.docker_get_port', mock_port)
 class BuildTest(DryccTransactionTestCase):
 
     """Tests build notification from build system"""
@@ -639,27 +636,6 @@ def test_release_create_failure(self, mock_requests):
             response = self.client.post(url, body)
             self.assertEqual(response.status_code, 400, response.data)
 
-    def test_release_registry_create_failure(self, mock_requests):
-        """
-        Cause a RegistryException in app.deploy to cause a failed release in build.create
-        """
-        app_id = self.create_app()
-
-        # deploy app to get a build
-        url = "/v2/apps/{app_id}/builds".format(**locals())
-        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'])
-
-        with mock.patch('api.models.Release.publish') as mock_registry:
-            mock_registry.side_effect = RegistryException('Boom!')
-
-            url = "/v2/apps/{app_id}/builds".format(**locals())
-            body = {'image': 'autotest/example', 'stack': 'container'}
-            response = self.client.post(url, body)
-            self.assertEqual(response.status_code, 400, response.data)
-
     def test_build_deploy_kube_failure(self, mock_requests):
         """
         Cause an Exception in scheduler.deploy

rootfs/api/tests/test_config.py

@@ -14,13 +14,11 @@
 
 from api.models import App, Config
 
-from api.tests import adapter, mock_port, DryccTransactionTestCase
+from api.tests import adapter, DryccTransactionTestCase
 import requests_mock
 
 
 @requests_mock.Mocker(real_http=True, adapter=adapter)
-@mock.patch('api.models.release.publish_release', lambda *args: None)
-@mock.patch('api.models.release.docker_get_port', mock_port)
 class ConfigTest(DryccTransactionTestCase):
     """Tests setting and updating config values"""
 

rootfs/api/tests/test_healthchecks.py

@@ -1,18 +1,15 @@
 import json
 import requests_mock
-from unittest import mock
 
 from django.core.cache import cache
 from django.contrib.auth.models import User
 from rest_framework.authtoken.models import Token
 
 from api.models import App
-from api.tests import adapter, mock_port, DryccTransactionTestCase
+from api.tests import adapter, DryccTransactionTestCase
 
 
 @requests_mock.Mocker(real_http=True, adapter=adapter)
-@mock.patch('api.models.release.publish_release', lambda *args: None)
-@mock.patch('api.models.release.docker_get_port', mock_port)
 class TestHealthchecks(DryccTransactionTestCase):
     """Tests setting and updating config values"""
 

rootfs/api/tests/test_hooks.py

@@ -6,10 +6,9 @@
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.core.cache import cache
-from unittest import mock
 from rest_framework.authtoken.models import Token
 
-from api.tests import adapter, mock_port, DryccTransactionTestCase
+from api.tests import adapter, DryccTransactionTestCase
 import requests_mock
 
 RSA_PUBKEY = (
@@ -48,8 +47,6 @@
 
 
 @requests_mock.Mocker(real_http=True, adapter=adapter)
-@mock.patch('api.models.release.publish_release', lambda *args: None)
-@mock.patch('api.models.release.docker_get_port', mock_port)
 class HookTest(DryccTransactionTestCase):
 
     """Tests API hooks used to trigger actions from external components"""