Merge pull request #285 from rapyuta-robotics/devel

🎉 release: v7.3.0

.github/workflows/gh-pages.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   deploy:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
 

Pipfile

@@ -24,7 +24,7 @@ graphlib-backport = ">=1.0.3"
 jinja2 = ">=3.0.1"
 munch = ">=2.4.0"
 pyyaml = ">=5.4.1"
-rapyuta-io = ">=1.14.0"
+rapyuta-io = ">=1.15.0"
 tabulate = ">=0.8.0"
 pyrfc3339 = ">=1.1"
 directory-tree = ">=0.0.3.1"

riocli/apply/manifests/deployment-nonros-device.yaml

@@ -23,4 +23,7 @@ spec:
   volumes:
     - execName: exec-docker
       mountPath: "/tmp" # Path on container
-      subPath: "/tmp" # Path on device
+      subPath: "/tmp" # Path on device
+      uid: 1000 # Optional userid for subpath
+      gid: 1000 # Optional groupid for subpath
+      perm: 755 # Optional permissions for subpath

riocli/apply/manifests/deployment-ros-device-no-rosbag.yaml

@@ -30,6 +30,9 @@ spec:
     - execName: exec-docker
       mountPath: "/tmp" # Path on container
       subPath: "/tmp" # Path on device
+      uid: 1000 # Optional userid for subpath
+      gid: 1000 # Optional groupid for subpath
+      perm: 755 # Optional permissions for subpath
   rosNetworks:
     - depends:
         kind: network

riocli/apply/manifests/staticroute.yaml

@@ -5,4 +5,7 @@ metadata:
   project: "project-guid"
   # region: us
   labels:
-    app: test
+    app: test
+spec:
+  sourceIPRange:
+  - 10.0.0.0/8

riocli/deployment/model.py

@@ -188,9 +188,12 @@ def create_object(self, client: Client, **kwargs) -> typing.Any:
             exec_mounts = []
             if 'volumes' in self.spec:
                 for vol in self.spec.volumes:
+                    uid = getattr(vol, 'uid', None)
+                    gid = getattr(vol, 'gid', None)
+                    perm = getattr(vol, 'perm', None)
                     exec_mounts.append(
                         ExecutableMount(vol.execName, vol.mountPath,
-                                        vol.subPath))
+                                        vol.subPath, uid, gid, perm))
 
             if len(exec_mounts) > 0:
                 provision_config = add_mount_volume_provision_config(

riocli/deployment/util.py

@@ -147,6 +147,12 @@ def add_mount_volume_provision_config(provision_config, component_name, device,
         exec_mount = {
             'mountPath': mount.mount_path
         }
+        if mount.uid is not None:
+            exec_mount['uid'] = mount.uid
+        if mount.gid is not None:
+            exec_mount['gid'] = mount.gid
+        if mount.perm is not None:
+            exec_mount['perm'] = mount.perm
         if mount.sub_path:
             exec_mount['subPath'] = mount.sub_path
         else:

riocli/jsonschema/schemas/deployment-schema.yaml

@@ -94,6 +94,13 @@ definitions:
       subPath:
         type: string
         pattern: '^\/$|(^(?=\/)|^\.|^\.\.)(\/(?=[^/\0])[^/\0]+)*\/?$'
+      uid:
+        type: integer
+      gid:
+        type: integer
+      perm:
+        type: integer
+
     additionalProperties: false
 
 

riocli/jsonschema/schemas/static_route-schema.yaml

@@ -51,11 +51,18 @@ definitions:
   uuid:
     type: string
     pattern: "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
+  ipRange:
+    type: string
+    pattern: '^((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)\.?\b){4}(?:/([1-9]|1\d|2\d|3[0-2]))?$'
   staticRouteSpec:
     type: object
     properties:
       url:
         type: string
+      sourceIPRange:
+        type: array
+        items:
+          "$ref": "#/definitions/ipRange"
   staticRouteStatus:
     type: object
     properties:

riocli/static_route/model.py

@@ -46,7 +46,14 @@ def create_object(self, client: Client, **kwargs) -> typing.Any:
         return unmunchify(r)
 
     def update_object(self, client: Client, obj: typing.Any) -> None:
-        pass
+        client = new_v2_client()
+
+        self.pop("rc", None)
+
+        static_route = unmunchify(self)
+        r = client.update_static_route(obj.metadata.name, static_route)
+
+        return unmunchify(r)
 
     def delete_object(self, client: Client, obj: typing.Any):
         client = new_v2_client()

riocli/v2client/client.py

@@ -390,6 +390,24 @@ def create_static_route(self, metadata: dict) -> Munch:
 
         return munchify(data)
 
+    def update_static_route(self, name: str, sr: dict) -> Munch:
+        """
+        Update the new static route
+        """
+        url = "{}/v2/staticroutes/{}/".format(self._host, name)
+        headers = self._config.get_auth_header()
+        response = RestClient(url).method(HttpMethod.PUT).headers(
+            headers).execute(payload=sr)
+
+        handle_server_errors(response)
+
+        data = json.loads(response.text)
+        if not response.ok:
+            err_msg = data.get('error')
+            raise Exception("static routes: {}".format(err_msg))
+
+        return munchify(data)
+
     def delete_static_route(self, name: str) -> Munch:
         """
         Delete a static route by its name

setup.py

@@ -47,7 +47,7 @@
         "python-dateutil>=2.8.2",
         "pytz",
         "pyyaml>=5.4.1",
-        "rapyuta-io>=1.14.0",
+        "rapyuta-io>=1.15.0",
         "requests>=2.20.0",
         "setuptools",
         "six>=1.13.0",