fix(controller): volume can not delete when ptype isn't exist

Author: jianxiaoguo

rootfs/api/models/release.py

@@ -387,8 +387,12 @@ def _delete_release_in_scheduler(self, namespace, procfile_types, version_name):
         for replica_set in replica_sets:
             # Deployment takes care of this in the API, RS does not
             # Have the RS scale down pods and delete itself
-            self.scheduler().rs.scale(namespace, replica_set['metadata']['name'], 0, timeout)
-            self.scheduler().rs.delete(namespace, replica_set['metadata']['name'])
+            try:
+                self.scheduler().rs.scale(namespace, replica_set['metadata']['name'], 0, timeout)
+                self.scheduler().rs.delete(namespace, replica_set['metadata']['name'])
+            except KubeHTTPException as e:
+                if e.response.status_code != 404:
+                    raise
 
     def save(self, *args, **kwargs):  # noqa
         if not self.summary:

rootfs/api/models/volume.py

@@ -36,8 +36,6 @@ def save(self, *args, **kwargs):
 
     @transaction.atomic
     def delete(self, *args, **kwargs):
-        if self.path:
-            raise DryccException("the volume is not unmounted")
         # Deatch volume, updates k8s
         if self.type == "csi":
             self._delete_pvc()

rootfs/api/views.py

@@ -855,7 +855,9 @@ def expand(self, request, **kwargs):
 
     def destroy(self, request, **kwargs):
         volume = self.get_object()
-        if volume.path != {}:
+        app = self.get_app()
+        is_subset = set(volume.path.keys()).issubset(set(app.procfile_types))
+        if volume.path != {} and is_subset:
             raise DryccException("this volume is mounting")
         volume.delete()
         return Response(status=status.HTTP_204_NO_CONTENT)