chore(pod): add pod default resources support

Author: duanhongyi

rootfs/api/models/app.py

@@ -286,7 +286,7 @@ def create(self, *args, **kwargs):  # noqa
                 try:
                     self._scheduler.quota.get(namespace, quota_name)
                 except KubeException:
-                    self._scheduler.quota.create(namespace, quota_name, data=quota_spec)
+                    self._scheduler.quota.create(namespace, quota_name, spec=quota_spec)
 
             try:
                 self._scheduler.svc.get(namespace, service)
@@ -1100,6 +1100,9 @@ def _gather_app_settings(self, release, app_settings, process_type, replicas):
         pod_termination_grace_period_seconds = int(config.values.get(
             'KUBERNETES_POD_TERMINATION_GRACE_PERIOD_SECONDS', settings.KUBERNETES_POD_TERMINATION_GRACE_PERIOD_SECONDS))  # noqa
 
+        # get pod default resources
+        pod_default_resources = json.loads(settings.KUBERNETES_POD_DEFAULT_RESOURCES)
+
         # set the image pull policy that is associated with the application container
         image_pull_policy = config.values.get('IMAGE_PULL_POLICY', settings.IMAGE_PULL_POLICY)
 
@@ -1123,6 +1126,7 @@ def _gather_app_settings(self, release, app_settings, process_type, replicas):
             'replicas': replicas,
             'version': 'v{}'.format(release.version),
             'app_type': process_type,
+            'resources': pod_default_resources,
             'build_type': release.build.type,
             'healthcheck': healthcheck,
             'lifecycle_post_start': config.lifecycle_post_start,

rootfs/api/settings/production.py

@@ -333,19 +333,34 @@
 # 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 pod spec for application
+KUBERNETES_POD_DEFAULT_RESOURCES = os.environ.get(
+    'KUBERNETES_POD_DEFAULT_RESOURCES',
+    json.dumps({
+        "requests": {
+            "cpu": "256m",
+            "memory": "256Mi"
+        },
+        "limits": {
+            "cpu": "512m",
+            "memory": "512Mi"
+        },
+    })
+)
+
 # Default quota spec for application namespace
 KUBERNETES_NAMESPACE_DEFAULT_QUOTA_SPEC = os.environ.get(
     'KUBERNETES_NAMESPACE_DEFAULT_QUOTA_SPEC',
-    json.dumps({"spec": {
+    json.dumps({
         "hard": {
-            "cpu": "4",
-            "memory": "4Gi",
-            "pods": "2",
+            "cpu": "8",
+            "pods": "16",
+            "memory": "32Gi",
             "ephemeral-storage": "1Gi",
             "requests.storage": "10Gi",
             "persistentvolumeclaims": 8,
         }
-    }})
+    })
 )
 
 # registry settings

rootfs/scheduler/resources/pod.py

@@ -119,7 +119,6 @@ def manifest(self, namespace, name, image, **kwargs):
             },
             'spec': {}
         }
-
         # pod manifest spec
         spec = manifest['spec']
 
@@ -231,8 +230,8 @@ def _set_resources(self, container, kwargs):
         app_type = kwargs.get("app_type")
         mem = kwargs.get("memory", {}).get(app_type)
         cpu = kwargs.get("cpu", {}).get(app_type)
+        resources = kwargs.get("resources", defaultdict(dict))
         if mem or cpu:
-            resources = defaultdict(dict)
             if mem:
                 if "/" in mem:
                     parts = mem.split("/")
@@ -248,8 +247,7 @@ def _set_resources(self, container, kwargs):
                     resources["limits"]["cpu"] = parts[1].lower()
                 else:
                     resources["limits"]["cpu"] = cpu.lower()
-            if resources:
-                container["resources"] = dict(resources)
+        container["resources"] = dict(resources)
 
     @staticmethod
     def _get_termination_grace_period(kwargs):

rootfs/scheduler/resources/quota.py

@@ -1,6 +1,5 @@
 from scheduler.exceptions import KubeHTTPException
 from scheduler.resources import Resource
-from scheduler.utils import dict_merge
 
 
 class Quota(Resource):
@@ -35,11 +34,9 @@ def create(self, namespace_name, name, **kwargs):
                     'heritage': 'drycc'
                 },
             },
-            'spec': {}
+            'spec': kwargs.get('spec', {})
         }
-
-        data = dict_merge(manifest, kwargs.get('data', {}))
-        response = self.http_post(url, json=data)
+        response = self.http_post(url, json=manifest)
         if not response.status_code == 201:
             raise KubeHTTPException(response,
                                     "create quota {} for namespace {}".format(

rootfs/scheduler/tests/test_pod_resources.py

@@ -52,4 +52,4 @@ def _assert_resources(self, caze, manifest):
         if expected:
             self.assertEqual(resources_parent["resources"], expected, caze)
         else:
-            self.assertTrue("resources" not in resources_parent, caze)
+            self.assertTrue(resources_parent["resources"] == {}, caze)

rootfs/scheduler/tests/test_quota.py

@@ -11,20 +11,18 @@ class QuotaTest(TestCase):
 
     def test_create_quota(self):
         namespace_name = self.create_namespace()
-        quota = {
-            'spec': {
-                'hard': {
-                    'cpu': '3',
-                    'pods': '10',
-                    'secrets': '5'
-                }
+        spec = {
+            'hard': {
+                'cpu': '3',
+                'pods': '10',
+                'secrets': '5'
             }
         }
-        self.scheduler.quota.create(namespace_name, 'test1', data=quota)
+        self.scheduler.quota.create(namespace_name, 'test1', spec=spec)
 
         response = self.scheduler.quota.get(namespace_name, 'test1')
         data = response.json()
-        self.assertEqual(data.get('spec', {}), quota['spec'])
+        self.assertEqual(data.get('spec', {}), spec)
         self.assertEqual(data['metadata']['namespace'], namespace_name)
 
     def test_create_with_nonexistent_namespace(self):