chore(quota): add kube quota config

Author: duanhongyi

rootfs/api/models/app.py

@@ -1100,12 +1100,6 @@ 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 limits and requests ephemeral_storage
-        ephemeral_storage = "{}/{}".format(
-            settings.KUBERNETES_REQUESTS_EPHEMERAL_STORAGE,
-            settings.KUBERNETES_LIMITS_EPHEMERAL_STORAGE,
-        )
-
         # 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,7 +1117,6 @@ def _gather_app_settings(self, release, app_settings, process_type, replicas):
         return {
             'memory': config.memory,
             'cpu': config.cpu,
-            'ephemeral_storage': ephemeral_storage,
             'tags': config.tags,
             'envs': envs,
             'registry': config.registry,
@@ -1142,7 +1135,7 @@ def _gather_app_settings(self, release, app_settings, process_type, replicas):
             'pod_termination_grace_period_seconds': pod_termination_grace_period_seconds,
             'pod_termination_grace_period_each': config.termination_grace_period,
             'image_pull_secret_name': image_pull_secret_name,
-            'image_pull_policy': image_pull_policy
+            'image_pull_policy': image_pull_policy,
         }
 
     def set_application_config(self, release):

rootfs/api/settings/production.py

@@ -334,13 +334,19 @@
 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
-
-# See spec.containers[].resources.requests.ephemeral-storage
-KUBERNETES_REQUESTS_EPHEMERAL_STORAGE = os.environ.get('KUBERNETES_REQUESTS_EPHEMERAL_STORAGE', '1Gi')  # noqa
-
-# See spec.containers[].resources.limits.ephemeral-storage
-KUBERNETES_LIMITS_EPHEMERAL_STORAGE = os.environ.get('KUBERNETES_LIMITS_EPHEMERAL_STORAGE', '2Gi')  # noqa
+KUBERNETES_NAMESPACE_DEFAULT_QUOTA_SPEC = os.environ.get(
+    'KUBERNETES_NAMESPACE_DEFAULT_QUOTA_SPEC',
+    json.dumps({"spec": {
+        "hard": {
+            "cpu": "4",
+            "memory": "4Gi",
+            "pods": "2",
+            "ephemeral-storage": "1Gi",
+            "requests.storage": "10Gi",
+            "persistentvolumeclaims": 8,
+        }
+    }})
+)
 
 # registry settings
 REGISTRY_HOST = os.environ.get('DRYCC_REGISTRY_PROXY_HOST', '127.0.0.1')

rootfs/scheduler/resources/pod.py

@@ -231,16 +231,15 @@ 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)
-        ephemeral_storage = kwargs.get("ephemeral_storage")
-        resources = defaultdict(dict)
         if mem or cpu:
+            resources = defaultdict(dict)
             if mem:
                 if "/" in mem:
                     parts = mem.split("/")
-                    resources["requests"]["memory"] = self._format_size(parts[0])
-                    resources["limits"]["memory"] = self._format_size(parts[1])
+                    resources["requests"]["memory"] = self._get_memory(parts[0])
+                    resources["limits"]["memory"] = self._get_memory(parts[1])
                 else:
-                    resources["limits"]["memory"] = self._format_size(mem)
+                    resources["limits"]["memory"] = self._get_memory(mem)
             if cpu:
                 # CPU needs to be defined as lower case
                 if "/" in cpu:
@@ -249,15 +248,6 @@ def _set_resources(self, container, kwargs):
                     resources["limits"]["cpu"] = parts[1].lower()
                 else:
                     resources["limits"]["cpu"] = cpu.lower()
-            if ephemeral_storage:
-                # ephemeral_storage needs to be defined as lower case
-                if "/" in ephemeral_storage:
-                    parts = ephemeral_storage.split("/")
-                    resources["requests"]["ephemeral_storage"] = self._format_size(parts[0])
-                    resources["limits"]["ephemeral_storage"] = self._format_size(parts[1])
-                else:
-                    resources["limits"]["ephemeral_storage"] = self._format_size(
-                        ephemeral_storage)
             if resources:
                 container["resources"] = dict(resources)
 
@@ -271,7 +261,7 @@ def _get_termination_grace_period(kwargs):
         return timeout_global if timeout_local is None else int(timeout_local)
 
     @staticmethod
-    def _format_size(size):
+    def _get_memory(size, ):
         """ Format memory limit value """
         if size[-2:-1].isalpha() and size[-1].isalpha():
             size = size[:-1]