feat(rootfs/api): restore k8s services from db and tune list op.

load services from db and re-create them in k8s, fine tune list services
response

Author: notmaxx

rootfs/api/management/commands/load_db_state_to_k8s.py

@@ -1,7 +1,7 @@
 from django.core.management.base import BaseCommand
 from django.shortcuts import get_object_or_404
 
-from api.models import Key, App, Domain, Certificate
+from api.models import Key, App, Domain, Certificate, Service
 from api.exceptions import DeisException, AlreadyExists
 
 
@@ -52,7 +52,7 @@ def save_apps(self):
             except DeisException as error:
                 print('ERROR: Problem saving to model {} for {}'
                       'due to {}'.format(str(App.__name__), str(app), str(error)))
-        for model in (Key, Domain, Certificate):
+        for model in (Key, Domain, Certificate, Service):
             for obj in model.objects.all():
                 try:
                     obj.save()

rootfs/api/models/service.py

@@ -41,15 +41,9 @@ def create(self, *args, **kwargs):  # noqa
         self._update_service(namespace, self.procfile_type, routable, annotations)
 
     def save(self, *args, **kwargs):
-        namespace = self.app.id
-        svc_name = "{}-{}".format(self.id, self.procfile_type)
-        self.log('updating Service: {}'.format(svc_name), level=logging.DEBUG)
-        annotations = self._gather_settings()
-        routable = annotations.pop('routable')
-        self._update_service(namespace, self.procfile_type, routable, annotations)
-
-        # Save to DB
-        return super(Service, self).save(*args, **kwargs)
+        service = super(Service, self).save(*args, **kwargs)
+        self.create()
+        return service
 
     def delete(self, *args, **kwargs):
         namespace = self.app.id
@@ -68,7 +62,7 @@ def delete(self, *args, **kwargs):
     def _gather_settings(self):
         app_settings = self.app.appsettings_set.latest()
         return {
-            'domains': "{}-{}".format(self.app.id, self.procfile_type)
+            'domains': "{}-{}".format(self.app.id, self.procfile_type),
             'maintenance': app_settings.maintenance,
             'routable': app_settings.routable,
             'proxyDomain': self.app.id,

rootfs/api/views.py

@@ -379,7 +379,7 @@ class ServiceViewSet(AppResourceViewSet):
     def list(self, *args, **kwargs):
         services = self.get_app().service_set.all()
         data = [ obj.as_dict() for obj in services ]
-        return Response(data, status=status.HTTP_200_OK)
+        return Response({"services": data}, status=status.HTTP_200_OK)
 
     def create_or_update(self, request, **kwargs):
         pft = self.get_serializer().validate_procfile_type(request.data.get('procfile_type'))