chore(controller): review pvc code

Author: duanhongyi

charts/controller/templates/controller-deployment.yaml

@@ -77,7 +77,7 @@ spec:
           - name: "IMAGE_PULL_POLICY"
             value: "{{ .Values.app_pull_policy }}"
 {{- if (.Values.app_storage_class) }}
-          - name: "DRYCC_APP_KUBERNETES_STORAGE_CLASS"
+          - name: "DRYCC_APP_STORAGE_CLASS"
             value: "{{ .Values.app_storage_class }}"
 {{- end }}
           - name: "TZ"

charts/controller/values.yaml

@@ -24,8 +24,6 @@ app_storage_class: ""
 # this is usually a non required setting.
 environment:
   RESERVED_NAMES: "drycc, drycc-builder, drycc-monitor-grafana"
-  KUBERNETES_POD_DEFAULT_RESOURCES: "{}"
-  KUBERNETES_NAMESPACE_DEFAULT_QUOTA_SPEC: "{}"
 
 nsqd:
   replicas: 1

rootfs/api/models/volume.py

@@ -29,7 +29,7 @@ def __str__(self):
     def save(self, *args, **kwargs):
         # Attach volume, updates k8s
         if self.created == self.updated:
-            self.attach(*args, **kwargs)
+            self.attach()
         # Save to DB
         return super(Volume, self).save(*args, **kwargs)
 
@@ -38,11 +38,11 @@ def delete(self, *args, **kwargs):
         if self.path:
             raise DryccException("the volume is not unmounted")
         # Deatch volume, updates k8s
-        self.detach(*args, **kwargs)
+        self.detach()
         # Delete from DB
         return super(Volume, self).delete(*args, **kwargs)
 
-    def attach(self, *args, **kwargs):
+    def attach(self):
         try:
             self._scheduler.pvc.get(self.app.id, self.name)
             err = "Volume {} already exists in this namespace".format(self.name)  # noqa
@@ -52,15 +52,16 @@ def attach(self, *args, **kwargs):
             logger.info(e)
             try:
                 kwargs = {
-                    "size": self.size
+                    "size": self.size,
+                    "storage_class": settings.DRYCC_APP_STORAGE_CLASS,
                 }
                 self._scheduler.pvc.create(self.app.id, self.name, **kwargs)
             except KubeException as e:
                 msg = 'There was a problem creating the volume ' \
                       '{} for {}'.format(self.name, self.app_id)
                 raise ServiceUnavailable(msg) from e
 
-    def detach(self, *args, **kwargs):
+    def detach(self):
         try:
             # We raise an exception when a volume doesn't exist
             self._scheduler.pvc.get(self.app.id, self.name)

rootfs/api/settings/production.py

@@ -326,7 +326,7 @@
 
 DRYCC_DEPLOY_HOOK_SECRET_KEY = os.environ.get('DRYCC_DEPLOY_HOOK_SECRET_KEY', None)
 
-DRYCC_APP_KUBERNETES_STORAGE_CLASS = os.environ.get('DRYCC_APP_KUBERNETES_STORAGE_CLASS', "")  # noqa
+DRYCC_APP_STORAGE_CLASS = os.environ.get('DRYCC_APP_STORAGE_CLASS', "")
 
 KUBERNETES_DEPLOYMENTS_REVISION_HISTORY_LIMIT = os.environ.get('KUBERNETES_DEPLOYMENTS_REVISION_HISTORY_LIMIT', None)  # noqa
 
@@ -340,12 +340,14 @@
     'KUBERNETES_POD_DEFAULT_RESOURCES',
     json.dumps({
         "requests": {
-            "cpu": "256m",
-            "memory": "256Mi"
+            "cpu": "200m",
+            "memory": "256Mi",
+            "ephemeral-storage": "1Gi"
         },
         "limits": {
-            "cpu": "512m",
-            "memory": "512Mi"
+            "cpu": "500m",
+            "memory": "512Mi",
+            "ephemeral-storage": "2Gi"
         },
     })
 )
@@ -355,11 +357,11 @@
     'KUBERNETES_NAMESPACE_DEFAULT_QUOTA_SPEC',
     json.dumps({
         "hard": {
-            "cpu": "8",
-            "pods": "16",
-            "memory": "32Gi",
-            "ephemeral-storage": "1Gi",
-            "requests.storage": "10Gi",
+            "cpu": "64",
+            "pods": "64",
+            "memory": "128Gi",
+            "ephemeral-storage": "64Gi",
+            "requests.storage": "256Gi",
             "persistentvolumeclaims": 8,
         }
     })

rootfs/api/settings/testing.py

@@ -42,7 +42,7 @@
 
 DRYCC_DEFAULT_CONFIG_TAGS = os.environ.get('DRYCC_DEFAULT_CONFIG_TAGS', '')
 
-DRYCC_APP_KUBERNETES_STORAGE_CLASS = os.environ.get('DRYCC_APP_KUBERNETES_STORAGE_CLASS', '')  # noqa
+DRYCC_APP_STORAGE_CLASS = os.environ.get('DRYCC_APP_STORAGE_CLASS', '')
 
 
 class DisableMigrations(object):

rootfs/api/tests/test_volume.py

@@ -36,7 +36,9 @@ def test_volumecreate(self, mock_requests):
 
         response = self.client.post(
             '/v2/apps/{}/volumes'.format(app_id),
-            data={'name': 'myvolume', 'size': '500M'}
+            data={
+                'name': 'myvolume', 'size': '500M'
+            }
         )
         self.assertEqual(response.status_code, 201, response.data)
 

rootfs/scheduler/resources/pvc.py

@@ -1,4 +1,3 @@
-from api.settings.production import DRYCC_APP_KUBERNETES_STORAGE_CLASS
 from scheduler.resources import Resource
 from scheduler.exceptions import KubeHTTPException
 
@@ -28,7 +27,7 @@ def manifest(namespace, name, version=None, **kwargs):
                         "storage": kwargs.get('size')
                     },
                 },
-                "storageClassName": DRYCC_APP_KUBERNETES_STORAGE_CLASS,
+                "storageClassName": kwargs.get("storage_class"),
                 "volumeMode": "Filesystem",
             }
         }

rootfs/scheduler/tests/test_pvc.py

@@ -18,7 +18,8 @@ def create(self, namespace=None, name=generate_random_name(), **kwargs):
         namespace = self.namespace if namespace is None else namespace
         # these are all required even if it is kwargs...
         kwargs = {
-            'size': '500M'
+            'size': '500M',
+            'storage_class': 'default'
         }
         pvc = self.scheduler.pvc.create(namespace, name, **kwargs)
         self.assertEqual(pvc.status_code, 201, pvc.json())