Merge branch 'master' into fix-modifying-docker-socket-gid

Matthew Fisher · web-flow · commit d0140177fcbc · 2016-12-14T09:21:45.000-08:00
diff --git a/Makefile b/Makefile
@@ -51,8 +51,8 @@ postgres: check-docker
 	@echo "    export PGUSER=postgres"
 
 setup-venv:
-	@if [ ! -d venv ]; then pyvenv venv && source venv/bin/activate; fi
-	pip install --disable-pip-version-check -q -r rootfs/requirements.txt -r rootfs/dev_requirements.txt
+	python3 -m venv venv
+	venv/bin/pip3 install --disable-pip-version-check -q -r rootfs/requirements.txt -r rootfs/dev_requirements.txt
 
 test: test-style test-check test-unit test-functional
 
diff --git a/rootfs/api/models/__init__.py b/rootfs/api/models/__init__.py
@@ -88,7 +88,7 @@ def _save_service_config(self, app, component, data):
         component = "%s.deis.io/" % component
 
         # add component to data and flatten
-        data = {"%s%s" % (component, key): value for key, value in list(data.items())}
+        data = {"%s%s" % (component, key): value for key, value in list(data.items()) if value}
         svc['metadata']['annotations'].update(morph.flatten(data))
 
         # Update the k8s service for the application with new service information
diff --git a/rootfs/api/models/app.py b/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:
diff --git a/rootfs/api/models/domain.py b/rootfs/api/models/domain.py
@@ -49,6 +49,10 @@ def delete(self, *args, **kwargs):
         app = str(self.app)
         domain = str(self.domain)
 
+        # Deatch cert, updates k8s
+        if self.certificate:
+            self.certificate.detach(domain=domain)
+
         # get config for the service
         config = self._load_service_config(app, 'router')
 
@@ -64,10 +68,6 @@ def delete(self, *args, **kwargs):
 
         self._save_service_config(app, 'router', config)
 
-        # Deatch cert, updates k8s
-        if self.certificate:
-            self.certificate.detach(domain=str(self.domain))
-
         # Delete from DB
         return super(Domain, self).delete(*args, **kwargs)
 
diff --git a/rootfs/api/settings/production.py b/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)
diff --git a/rootfs/api/settings/testing.py b/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"}}}'
diff --git a/rootfs/requirements.txt b/rootfs/requirements.txt
@@ -10,6 +10,7 @@ jmespath==0.9.0
 jsonfield==1.0.3
 morph==0.1.2
 ndg-httpsclient==0.4.2
+packaging==16.8
 psycopg2==2.6.2
 pyOpenSSL==16.2.0
 pytz==2016.10
diff --git a/rootfs/scheduler/__init__.py b/rootfs/scheduler/__init__.py
@@ -1,6 +1,7 @@
 from collections import OrderedDict
 from datetime import datetime
 import logging
+from packaging.version import Version
 import requests
 import requests.exceptions
 from requests_toolbelt import user_agent
@@ -77,13 +78,13 @@ def __getattr__(self, name):
         return object.__getattribute__(self, name)
 
     def version(self):
-        """Get Kubernetes version as a float"""
+        """Get Kubernetes version"""
         response = self.http_get('/version')
         if self.unhealthy(response.status_code):
             raise KubeHTTPException(response, 'fetching Kubernetes version')
 
         data = response.json()
-        return float('{}.{}'.format(data['major'], data['minor']))
+        return Version('{}.{}'.format(data['major'], data['minor']))
 
     @staticmethod
     def parse_date(date):
diff --git a/rootfs/scheduler/mock.py b/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'
 ]
 
 
diff --git a/rootfs/scheduler/resources/horizontalpodautoscaler.py b/rootfs/scheduler/resources/horizontalpodautoscaler.py
@@ -1,4 +1,6 @@
 import json
+from packaging.version import parse
+
 from scheduler.resources import Resource
 from scheduler.exceptions import KubeException, KubeHTTPException
 
@@ -11,7 +13,7 @@ class HorizontalPodAutoscaler(Resource):
     def api_version(self):
         # API location changes between versions
         # http://kubernetes.io/docs/user-guide/horizontal-pod-autoscaling/#api-object
-        if self.version() >= 1.3:
+        if self.version() >= parse("1.3.0"):
             return 'autoscaling/v1'
 
         # 1.2 and older
@@ -69,15 +71,15 @@ def manifest(self, namespace, name, app_type, target, **kwargs):
             }
         }
 
-        if self.version() >= 1.3:
+        if self.version() >= parse("1.3.0"):
             manifest['spec']['targetCPUUtilizationPercentage'] = cpu_percent
 
             manifest['spec']['scaleTargetRef'] = {
                 # only works with Deployments, RS and RC
                 'kind': target['kind'],
                 'name': target['metadata']['name'],
             }
-        elif self.version() <= 1.2:
+        elif self.version() <= parse("1.2.0"):
             # api changed between version
             manifest['spec']['cpuUtilization'] = {
                 'targetPercentage': cpu_percent
@@ -149,10 +151,10 @@ def wait(self, namespace, name):
         # ideally it would use the resources wait commands but they vary
         for _ in range(30):
             # fetch resource attached to it
-            if self.version() >= 1.3:
+            if self.version() >= parse("1.3.0"):
                 resource_kind = hpa['spec']['scaleTargetRef']['kind'].lower()
                 resource_name = hpa['spec']['scaleTargetRef']['name']
-            elif self.version() <= 1.2:
+            elif self.version() <= parse("1.2.0"):
                 resource_kind = hpa['spec']['scaleRef']['kind'].lower()
                 resource_name = hpa['spec']['scaleRef']['name']
 
diff --git a/rootfs/scheduler/resources/quota.py b/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
diff --git a/rootfs/scheduler/tests/test_horizontalpodautoscaler_12_lower.py b/rootfs/scheduler/tests/test_horizontalpodautoscaler_12_lower.py
@@ -3,13 +3,15 @@
 
 Run the tests with './manage.py test scheduler'
 """
+from packaging.version import Version
 from unittest import mock
+
 from scheduler import KubeHTTPException, KubeException
 from scheduler.tests import TestCase
 from scheduler.utils import generate_random_name
 
 
-@mock.patch('scheduler.KubeHTTPClient.version', lambda *args: 1.2)
+@mock.patch('scheduler.KubeHTTPClient.version', lambda *args: Version('1.2'))
 class HorizontalPodAutoscalersTest(TestCase):
     """Tests scheduler horizontalpodautoscaler calls"""
 
diff --git a/rootfs/scheduler/tests/test_quota.py b/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={})

Original file line number	Diff line number	Diff line change
`@@ -36,3 +36,4 @@`
`36`	`36`
`37`	`37`	`# How long k8s waits for a pod to finish work after a SIGTERM before sending SIGKILL`
`38`	`38`	`KUBERNETES_POD_TERMINATION_GRACE_PERIOD_SECONDS = int(os.environ.get('KUBERNETES_POD_TERMINATION_GRACE_PERIOD_SECONDS', 2)) # noqa`
	`39`	`+KUBERNETES_NAMESPACE_DEFAULT_QUOTA_SPEC = '{"spec":{"hard":{"pods":"10"}}}'`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ def _acquire(self):`
`80`	`80`	`resources = [`
`81`	`81`	`'namespaces', 'nodes', 'pods', 'replicationcontrollers',`
`82`	`82`	`'secrets', 'services', 'events', 'deployments', 'replicasets',`
`83`		`- 'horizontalpodautoscalers', 'scale',`
	`83`	`+ 'horizontalpodautoscalers', 'scale', 'resourcequotas'`
`84`	`84`	`]`
`85`	`85`
`86`	`86`