ref(*): deprecate cluster domain object

Author: Gabriel Monroy

api/admin.py

@@ -11,7 +11,6 @@
 
 from .models import App
 from .models import Build
-from .models import Cluster
 from .models import Config
 from .models import Container
 from .models import Domain
@@ -24,8 +23,8 @@ class AppAdmin(GuardedModelAdmin):
     in the Django admin.
     """
     date_hierarchy = 'created'
-    list_display = ('id', 'owner', 'cluster')
-    list_filter = ('owner', 'cluster')
+    list_display = ('id', 'owner')
+    list_filter = ('owner',)
 admin.site.register(App, AppAdmin)
 
 
@@ -39,16 +38,6 @@ class BuildAdmin(admin.ModelAdmin):
 admin.site.register(Build, BuildAdmin)
 
 
-class ClusterAdmin(admin.ModelAdmin):
-    """Set presentation options for :class:`~api.models.Cluster` models
-    in the Django admin.
-    """
-    date_hierarchy = 'created'
-    list_display = ('id', 'owner', 'domain')
-    list_filter = ('owner',)
-admin.site.register(Cluster, ClusterAdmin)
-
-
 class ConfigAdmin(admin.ModelAdmin):
     """Set presentation options for :class:`~api.models.Config` models
     in the Django admin.

api/fixtures/dev.json

@@ -39,24 +39,8 @@
     "pk": 1,
     "model": "sites.site",
     "fields": {
-        "domain": "local.deisapp.com",
-        "name": "local.deisapp.com"
-    }
-},
-{
-    "pk": "8b196fb8-5774-4512-b3cc-569af8894a6c",
-    "model": "api.cluster",
-    "fields": {
-        "updated": "2014-01-27T23:32:51.173Z",
-        "created": "2014-01-27T23:32:02.148Z",
-        "domain": "local.deisapp.com",
-        "owner": [
-            "devuser"
-        ],
-	"hosts": "host1,host2,host3",
-	"auth": "base64string",
-	"options": "{}",
-        "id": "dev"
+        "domain": "local3.deisapp.com",
+        "name": "local3.deisapp.com"
     }
 }
 ]

api/fixtures/test_sharing.json

@@ -53,27 +53,12 @@
     "date_joined": "2013-11-25T21:59:30.760Z"
   }
 },
-{
-  "pk": "80e9db5a-d394-41c7-b153-3ea0314dc8ca",
-  "model": "api.cluster",
-  "fields": {
-    "updated": "2013-11-25T22:09:36.726Z",
-    "created": "2013-11-25T22:09:36.726Z",
-    "domain": "autotest.local",
-    "owner": 2,
-    "hosts": "host1,host2,host3",
-    "auth": "base64string",
-    "options": "{}",
-    "id": "autotest-1"
-  }
-},
 {
   "pk": "5a09a1e0-a27e-4839-928b-449310ed90f0",
   "model": "api.app",
   "fields": {
     "updated": "2013-11-25T22:09:36.726Z",
     "created": "2013-11-25T22:09:36.726Z",
-    "cluster": "80e9db5a-d394-41c7-b153-3ea0314dc8ca",
     "owner": 2,
     "id": "autotest-1-app"
   }
@@ -84,7 +69,6 @@
   "fields": {
     "updated": "2013-11-25T22:09:36.726Z",
     "created": "2013-11-25T22:09:36.726Z",
-    "cluster": "80e9db5a-d394-41c7-b153-3ea0314dc8ca",
     "owner": 3,
     "id": "autotest-2-app"
   }

api/models.py

@@ -88,49 +88,6 @@ class Meta:
         abstract = True
 
 
-@python_2_unicode_compatible
-class Cluster(UuidAuditedModel):
-    """
-    Cluster used to run jobs
-    """
-
-    CLUSTER_TYPES = (('mock', 'Mock Cluster'),
-                     ('coreos', 'CoreOS Cluster'),
-                     ('chaos', 'Chaos Cluster'))
-
-    owner = models.ForeignKey(settings.AUTH_USER_MODEL)
-    id = models.CharField(max_length=128, unique=True)
-    type = models.CharField(max_length=16, choices=CLUSTER_TYPES, default='coreos')
-
-    domain = models.CharField(max_length=128, validators=[validate_domain])
-    hosts = models.CharField(max_length=256, validators=[validate_comma_separated])
-    auth = models.TextField()
-    options = JSONField(default={}, blank=True)
-
-    def __str__(self):
-        return self.id
-
-    def _get_scheduler(self, *args, **kwargs):
-        module_name = 'scheduler.' + self.type
-        mod = importlib.import_module(module_name)
-        return mod.SchedulerClient(self.id, self.hosts, self.auth,
-                                   self.domain, self.options)
-
-    _scheduler = property(_get_scheduler)
-
-    def create(self):
-        """
-        Initialize a cluster's router and log aggregator
-        """
-        return self._scheduler.setUp()
-
-    def destroy(self):
-        """
-        Destroy a cluster's router and log aggregator
-        """
-        return self._scheduler.tearDown()
-
-
 @python_2_unicode_compatible
 class App(UuidAuditedModel):
     """
@@ -139,7 +96,6 @@ class App(UuidAuditedModel):
 
     owner = models.ForeignKey(settings.AUTH_USER_MODEL)
     id = models.SlugField(max_length=64, unique=True)
-    cluster = models.ForeignKey('Cluster')
     structure = JSONField(default={}, blank=True, validators=[validate_app_structure])
 
     class Meta:
@@ -148,9 +104,20 @@ class Meta:
     def __str__(self):
         return self.id
 
+    def _get_scheduler(self, *args, **kwargs):
+        module_name = 'scheduler.' + settings.SCHEDULER_MODULE
+        mod = importlib.import_module(module_name)
+
+        return mod.SchedulerClient(settings.SCHEDULER_TARGET,
+                                   settings.SCHEDULER_AUTH,
+                                   settings.SCHEDULER_OPTIONS,
+                                   settings.SSH_PRIVATE_KEY)
+
+    _scheduler = property(_get_scheduler)
+
     @property
     def url(self):
-        return self.id + '.' + self.cluster.domain
+        return self.id + '.' + settings.DEIS_DOMAIN
 
     def log(self, message):
         """Logs a message to the application's log file.
@@ -341,6 +308,12 @@ def logs(self):
 
     def run(self, user, command):
         """Run a one-off command in an ephemeral app container."""
+
+        # FIXME: remove the need for SSH private keys by using
+        # a scheduler that supports one-off admin tasks natively
+        if not settings.SSH_PRIVATE_KEY:
+            raise EnvironmentError('Support for admin commands is not configured')
+
         # TODO: add support for interactive shell
         msg = "{} runs '{}'".format(user.username, command)
         log_event(self, msg)
@@ -420,7 +393,7 @@ def _get_job_id(self):
     _job_id = property(_get_job_id)
 
     def _get_scheduler(self):
-        return self.app.cluster._scheduler
+        return self.app._scheduler
 
     _scheduler = property(_get_scheduler)
 

api/serializers.py

@@ -73,40 +73,32 @@ class Meta:
         read_only_fields = ('username',)
 
 
-class ClusterSerializer(serializers.ModelSerializer):
-    """Serialize a :class:`~api.models.Cluster` model."""
+class AppSerializer(serializers.ModelSerializer):
+    """Serialize a :class:`~api.models.App` model."""
 
     owner = serializers.Field(source='owner.username')
-    options = JSONFieldSerializer(source='options', required=False)
+    id = serializers.SlugField(default=utils.generate_app_name)
+    url = serializers.Field(source='url')
+    structure = JSONFieldSerializer(source='structure', required=False)
 
     class Meta:
-        """Metadata options for a :class:`ClusterSerializer`."""
-        model = models.Cluster
+        """Metadata options for a :class:`AppSerializer`."""
+        model = models.App
         read_only_fields = ('created', 'updated')
 
-    def validate_domain(self, attrs, source):
-        value = attrs[source]
-        models.validate_domain(value)
-        return attrs
-
-    def validate_hosts(self, attrs, source):
+    def validate_id(self, attrs, source):
+        """
+        Check that the ID is all lowercase and not 'deis'
+        """
         value = attrs[source]
-        models.validate_comma_separated(value)
+        match = re.match(r'^[a-z0-9-]+$', value)
+        if not match:
+            raise serializers.ValidationError("App IDs can only contain [a-z0-9-]")
+        if value == 'deis':
+            raise serializers.ValidationError("App IDs cannot be 'deis'")
         return attrs
 
 
-class PushSerializer(serializers.ModelSerializer):
-    """Serialize a :class:`~api.models.Push` model."""
-
-    owner = serializers.Field(source='owner.username')
-    app = serializers.SlugRelatedField(slug_field='id')
-
-    class Meta:
-        """Metadata options for a :class:`PushSerializer`."""
-        model = models.Push
-        read_only_fields = ('uuid', 'created', 'updated')
-
-
 class BuildSerializer(serializers.ModelSerializer):
     """Serialize a :class:`~api.models.Build` model."""
 
@@ -189,33 +181,6 @@ class Meta:
         read_only_fields = ('uuid', 'created', 'updated')
 
 
-class AppSerializer(serializers.ModelSerializer):
-    """Serialize a :class:`~api.models.App` model."""
-
-    owner = serializers.Field(source='owner.username')
-    id = serializers.SlugField(default=utils.generate_app_name)
-    cluster = serializers.SlugRelatedField(slug_field='id')
-    url = serializers.Field(source='url')
-    structure = JSONFieldSerializer(source='structure', required=False)
-
-    class Meta:
-        """Metadata options for a :class:`AppSerializer`."""
-        model = models.App
-        read_only_fields = ('created', 'updated')
-
-    def validate_id(self, attrs, source):
-        """
-        Check that the ID is all lowercase and not 'deis'
-        """
-        value = attrs[source]
-        match = re.match(r'^[a-z0-9-]+$', value)
-        if not match:
-            raise serializers.ValidationError("App IDs can only contain [a-z0-9-]")
-        if value == 'deis':
-            raise serializers.ValidationError("App IDs cannot be 'deis'")
-        return attrs
-
-
 class ContainerSerializer(serializers.ModelSerializer):
     """Serialize a :class:`~api.models.Container` model."""
 
@@ -278,3 +243,15 @@ def validate_domain(self, attrs, source):
                 "Adding a wildcard subdomain is currently not supported".format(value))
 
         return attrs
+
+
+class PushSerializer(serializers.ModelSerializer):
+    """Serialize a :class:`~api.models.Push` model."""
+
+    owner = serializers.Field(source='owner.username')
+    app = serializers.SlugRelatedField(slug_field='id')
+
+    class Meta:
+        """Metadata options for a :class:`PushSerializer`."""
+        model = models.Push
+        read_only_fields = ('uuid', 'created', 'updated')