Hostpath volume

paddlecloud/paddlecloud/settings.py

@@ -270,6 +270,15 @@
 #        "admin_key": "/certs/admin.secret"
 #    }
 #}
+#for HostPath example:
+#DATACENTERS = {
+#   ...
+#   "dc1":{
+#       "type": "hostpath",
+#       "host_path": "/mnt/hdfs/",
+#       "mount_path" "/pfs/dc1/home/%s/" # mount_path % username
+#    }
+#}
 DATACENTERS = {
     "datacenter1":{
         "type": "cephfs",

paddlecloud/paddlejob/__init__.py

@@ -1,4 +1,3 @@
 from paddle_job import PaddleJob
-from cephfs_volume import CephFSVolume
-
-__all__ = ["CephFSVolume", "PaddleJob"]
+import volumes
+__all__ = ["volumes", "PaddleJob"]

paddlecloud/paddlejob/paddle_job.py

@@ -1,7 +1,7 @@
 import kubernetes
 from kubernetes import client, config
 import os
-from cephfs_volume import CephFSVolume
+from volumes import *
 
 __all__ = ["PaddleJob"]
 DEFAULT_PADDLE_PORT=7164

paddlecloud/paddlejob/views.py

@@ -3,7 +3,8 @@
 from django.conf import settings
 from kubernetes import client, config
 from kubernetes.client.rest import ApiException
-from . import PaddleJob, CephFSVolume
+from . import PaddleJob
+from volumes import CephFSVolume, HostPathVolume
 from rest_framework.authtoken.models import Token
 from rest_framework import viewsets, generics, permissions
 from rest_framework.response import Response
@@ -40,14 +41,21 @@ def post(self, request, format=None):
         dc = obj.get("datacenter")
         volumes = []
         for name, cfg in settings.DATACENTERS.items():
-            if cfg["type"] == "cephfs":
-                volumes.append(CephFSVolume(
-                    monitors_addr = cfg["monitors_addr"],
-                    user = cfg["user"],
-                    secret_name = cfg["secret"],
-                    mount_path = cfg["mount_path"] % username,
-                    cephfs_path = cfg["cephfs_path"] % username
-                ))
+            if dc == name:
+                if cfg["type"] == "cephfs":
+                    volumes.append(CephFSVolume(
+                        monitors_addr = cfg["monitors_addr"],
+                        user = cfg["user"],
+                        secret_name = cfg["secret"],
+                        mount_path = cfg["mount_path"] % username,
+                        cephfs_path = cfg["cephfs_path"] % username
+                    ))
+                elif cfg["type"] == "hostpath":
+                    volumes.append(HostPathVolume(
+                        name = dc.replace("_", "-"),
+                        host_path = cfg["host_path"],
+                        mount_path = cfg["mount_path"] % username
+                    ))
 
 
         paddle_job = PaddleJob(

paddlecloud/paddlejob/volumes/__init__.py

@@ -0,0 +1,4 @@
+from cephfs_volume import CephFSVolume
+from hostpath_volume import HostPathVolume
+
+__all__ = ["CephFSVolume", "HostPathVolume"]

paddlecloud/paddlejob/cephfs_volume.py → paddlecloud/paddlejob/volumes/cephfs_volume.py

@@ -1,18 +1,7 @@
+from volume import Volume
 __all__ = ["CephFSVolume"]
 
 
-class Volume(object):
-    def __init__(self):
-        pass
-
-    @property
-    def volume(self):
-        return {}
-
-    @property
-    def volume_mount(self):
-        return {}
-
 class CephFSVolume(Volume):
     def __init__(self, monitors_addr, user, secret_name, mount_path, cephfs_path):
         self._monitors = monitors_addr

paddlecloud/paddlejob/volumes/hostpath_volume.py

@@ -0,0 +1,23 @@
+from volume import Volume
+__all__ = ["HostPathVolume"]
+class HostPathVolume(Volume):
+    def __init__(self, name, host_path, mount_path):
+        self._name = name
+        self._host_path = host_path
+        self._mount_path = mount_path
+
+    @property
+    def volume(self):
+        return {
+            "name": self._name,
+            "hostPath": {
+                "path": self._host_path
+            }
+        }
+
+    @property
+    def volume_mount(self):
+        return {
+            "name": self._name,
+            "mountPath": self._mount_path
+        }

paddlecloud/paddlejob/volumes/volume.py

@@ -0,0 +1,12 @@
+
+class Volume(object):
+    def __init__(self):
+        pass
+
+    @property
+    def volume(self):
+        return {}
+
+    @property
+    def volume_mount(self):
+        return {}