Merge pull request #1149 from rvadim/default-resource-quota-support

Add basic support of resource quotas for applications

Author: kmala

rootfs/api/models/app.py

@@ -203,6 +203,7 @@ def create(self, *args, **kwargs):  # noqa
         # create required minimum resources in k8s for the application
         namespace = self.id
         service = self.id
+        quota_name = '{}-quota'.format(self.id)
         try:
             self.log('creating Namespace {} and services'.format(namespace), level=logging.DEBUG)
             # Create essential resources
@@ -211,6 +212,15 @@ def create(self, *args, **kwargs):  # noqa
             except KubeException:
                 self._scheduler.ns.create(namespace)
 
+            if settings.KUBERNETES_NAMESPACE_DEFAULT_QUOTA_SPEC != '':
+                quota_spec = json.loads(settings.KUBERNETES_NAMESPACE_DEFAULT_QUOTA_SPEC)
+                self.log('creating Quota {} for namespace {}'.format(quota_name, namespace),
+                         level=logging.DEBUG)
+                try:
+                    self._scheduler.quota.get(namespace, quota_name)
+                except KubeException:
+                    self._scheduler.quota.create(namespace, quota_name, data=quota_spec)
+
             try:
                 self._scheduler.svc.get(namespace, service)
             except KubeException:

rootfs/api/settings/production.py

@@ -299,6 +299,9 @@
 # How long k8s waits for a pod to finish work after a SIGTERM before sending SIGKILL
 KUBERNETES_POD_TERMINATION_GRACE_PERIOD_SECONDS = int(os.environ.get('KUBERNETES_POD_TERMINATION_GRACE_PERIOD_SECONDS', 30))  # noqa
 
+# Default quota spec for application namespace
+KUBERNETES_NAMESPACE_DEFAULT_QUOTA_SPEC = os.environ.get('KUBERNETES_NAMESPACE_DEFAULT_QUOTA_SPEC', '')  # noqa
+
 # registry settings
 REGISTRY_HOST = os.environ.get('DEIS_REGISTRY_SERVICE_HOST', '127.0.0.1')
 REGISTRY_PORT = os.environ.get('DEIS_REGISTRY_SERVICE_PORT', 5000)

rootfs/api/settings/testing.py

@@ -36,3 +36,4 @@
 
 # How long k8s waits for a pod to finish work after a SIGTERM before sending SIGKILL
 KUBERNETES_POD_TERMINATION_GRACE_PERIOD_SECONDS = int(os.environ.get('KUBERNETES_POD_TERMINATION_GRACE_PERIOD_SECONDS', 2))  # noqa
+KUBERNETES_NAMESPACE_DEFAULT_QUOTA_SPEC = '{"spec":{"hard":{"pods":"10"}}}'

rootfs/scheduler/mock.py

@@ -80,7 +80,7 @@ def _acquire(self):
 resources = [
     'namespaces', 'nodes', 'pods', 'replicationcontrollers',
     'secrets', 'services', 'events', 'deployments', 'replicasets',
-    'horizontalpodautoscalers', 'scale',
+    'horizontalpodautoscalers', 'scale', 'resourcequotas'
 ]
 
 

rootfs/scheduler/resources/quota.py

@@ -0,0 +1,48 @@
+from scheduler.exceptions import KubeHTTPException
+from scheduler.resources import Resource
+from scheduler.utils import dict_merge
+
+
+class Quota(Resource):
+    short_name = 'quota'
+
+    def get(self, namespace_name, name):
+        """
+        Fetch a single quota
+        """
+        url = '/namespaces/{}/resourcequotas/{}'.format(namespace_name, name)
+        message = 'get quota {} for namespace {}'.format(name, namespace_name)
+        url = self.api(url)
+        response = self.http_get(url)
+        if self.unhealthy(response.status_code):
+            raise KubeHTTPException(response, message)
+
+        return response
+
+    def create(self, namespace_name, name, **kwargs):
+        """
+        Create resource quota for namespace
+        """
+        url = self.api("/namespaces/{}/resourcequotas".format(namespace_name))
+        manifest = {
+            "kind": "ResourceQuota",
+            "apiVersion": "v1",
+            "metadata": {
+                "namespace": namespace_name,
+                "name": name,
+                'labels': {
+                    'app': namespace_name,
+                    'heritage': 'deis'
+                },
+            },
+            'spec': {}
+        }
+
+        data = dict_merge(manifest, kwargs.get('data', {}))
+        response = self.http_post(url, json=data)
+        if not response.status_code == 201:
+            raise KubeHTTPException(response,
+                                    "create quota {} for namespace {}".format(
+                                        name, namespace_name))
+
+        return response

rootfs/scheduler/tests/test_quota.py

@@ -0,0 +1,35 @@
+"""
+Unit tests for the Deis scheduler module.
+
+Run the tests with './manage.py test scheduler'
+"""
+from scheduler.tests import TestCase
+from scheduler import KubeHTTPException
+
+
+class QuotaTest(TestCase):
+
+    def test_create_quota(self):
+        namespace_name = self.create_namespace()
+        quota = {
+            'spec': {
+                'hard': {
+                    'cpu': '3',
+                    'pods': '10',
+                    'secrets': '5'
+                }
+            }
+        }
+        self.scheduler.quota.create(namespace_name, 'test1', data=quota)
+
+        response = self.scheduler.quota.get(namespace_name, 'test1')
+        data = response.json()
+        self.assertEqual(data.get('spec', {}), quota['spec'])
+        self.assertEqual(data['metadata']['namespace'], namespace_name)
+
+    def test_create_with_nonexistent_namespace(self):
+        with self.assertRaises(
+            KubeHTTPException,
+            msg='failed to create quota test1 for namespace ghost-namespace: 404 Not Found'
+        ):
+            self.scheduler.quota.create('ghost-namespace', 'test1', data={})