ref(*): remove the notion of a platform domain known to workflow

Addresses the workflow side of #111 but doesn't do the client part so that it opens up the right domain

Author: helgi

rootfs/api/models.py

@@ -184,10 +184,6 @@ def save(self, **kwargs):
     def __str__(self):
         return self.id
 
-    @property
-    def url(self):
-        return self.id + '.' + settings.DEIS_DOMAIN
-
     def _get_job_id(self, container_type):
         app = self.id
         release = self.release_set.latest()

rootfs/api/serializers.py

@@ -131,7 +131,7 @@ class AppSerializer(serializers.ModelSerializer):
     class Meta:
         """Metadata options for a :class:`AppSerializer`."""
         model = models.App
-        fields = ['uuid', 'id', 'owner', 'url', 'structure', 'created', 'updated']
+        fields = ['uuid', 'id', 'owner', 'structure', 'created', 'updated']
         read_only_fields = ['uuid']
 
 

rootfs/api/tests/test_app.py

@@ -60,11 +60,10 @@ def test_response_data(self):
                                     content_type='application/json',
                                     HTTP_AUTHORIZATION='token {}'.format(self.token))
         for key in response.data:
-            self.assertIn(key, ['uuid', 'created', 'updated', 'id', 'owner', 'url', 'structure'])
+            self.assertIn(key, ['uuid', 'created', 'updated', 'id', 'owner', 'structure'])
         expected = {
             'id': 'test',
             'owner': self.user.username,
-            'url': 'test.deisapp.local',
             'structure': {}
         }
         self.assertDictContainsSubset(expected, response.data)

rootfs/api/tests/test_hooks.py

@@ -113,7 +113,6 @@ def test_build_hook(self):
         self.assertEqual(response.status_code, 200)
         self.assertIn('release', response.data)
         self.assertIn('version', response.data['release'])
-        self.assertIn('domains', response.data)
 
     def test_build_hook_procfile(self):
         """Test creating a Procfile build via an API Hook"""
@@ -139,7 +138,6 @@ def test_build_hook_procfile(self):
         self.assertEqual(response.status_code, 200)
         self.assertIn('release', response.data)
         self.assertIn('version', response.data['release'])
-        self.assertIn('domains', response.data)
         # make sure build fields were populated
         url = '/v2/apps/{app_id}/builds'.format(**locals())
         response = self.client.get(url, HTTP_AUTHORIZATION='token {}'.format(self.token))
@@ -183,7 +181,6 @@ def test_build_hook_dockerfile(self):
         self.assertEqual(response.status_code, 200)
         self.assertIn('release', response.data)
         self.assertIn('version', response.data['release'])
-        self.assertIn('domains', response.data)
         # make sure build fields were populated
         url = '/v2/apps/{app_id}/builds'.format(**locals())
         response = self.client.get(url, HTTP_AUTHORIZATION='token {}'.format(self.token))

rootfs/api/views.py

@@ -405,8 +405,7 @@ def create(self, request, *args, **kwargs):
         request.data['owner'] = self.user
         super(BuildHookViewSet, self).create(request, *args, **kwargs)
         # return the application databag
-        response = {'release': {'version': app.release_set.latest().version},
-                    'domains': ['.'.join([app.id, settings.DEIS_DOMAIN])]}
+        response = {'release': {'version': app.release_set.latest().version}}
         return Response(response, status=status.HTTP_200_OK)
 
     def post_save(self, build):

rootfs/bin/boot

@@ -64,10 +64,6 @@ etcd_safe_mkdir /deis/platform
 etcd_safe_mkdir /deis/scheduler
 etcd_safe_mkdir /deis/services
 
-# HACK: set up keys for platform
-etcd_safe_mkdir /deis/platform
-ETCD_PATH=/deis/platform etcd_set_default domain localhost
-
 # wait for confd to run once and install initial templates
 until confd -onetime -node "$ETCD" --confdir /app --log-level error; do
 	echo "controller: waiting for confd to write initial templates..."

rootfs/deis/settings.py

@@ -274,7 +274,6 @@
 # default deis settings
 LOG_LINES = 1000
 TEMPDIR = tempfile.mkdtemp(prefix='deis')
-DEIS_DOMAIN = 'deisapp.local'
 
 # standard datetime format used for logging, model timestamps, etc.
 DEIS_DATETIME_FORMAT = '%Y-%m-%dT%H:%M:%S%Z'

rootfs/templates/confd_settings.py

@@ -10,9 +10,6 @@
     os.environ.get('KUBERNETES_SERVICE_HOST', 'kubernetes.default.svc.cluster.local'),
     os.environ.get('KUBERNETES_SERVICE_PORT', '443'))
 
-# platform domain must be provided
-DEIS_DOMAIN = '{{ getv "/deis/platform/domain" }}'
-
 {{ if exists "/deis/controller/registrationMode" }}
 REGISTRATION_MODE = '{{ getv "/deis/controller/registrationMode" }}'
 {{ end }}