fix(manifests): fix manifests of resources

rapyuta-robotics · Sep 4, 2024 · 4f5e9bb · 4f5e9bb
1 parent 7891a5c
commit 4f5e9bb
Show file tree

Hide file tree

Showing 18 changed files with 55 additions and 67 deletions.
diff --git a/riocli/apply/manifests/deployment-nonros-cloud.yaml b/riocli/apply/manifests/deployment-nonros-cloud.yaml
@@ -7,9 +7,9 @@ metadata:
     nameOrGUID: "package-nonros-cloud"
     version: "v1.0.0"
   project: "project-guid"
+  region: jp
   labels:
     app: test
-    #rapyuta.io/region: us
 spec:
   runtime: cloud # Options: [device, cloud]
   depends:
@@ -41,5 +41,4 @@ spec:
       enabled: true
       trees:
         - config01
-        - config02
-      disableSync: false
+        - config02
diff --git a/riocli/apply/manifests/deployment-ros-cloud.yaml b/riocli/apply/manifests/deployment-ros-cloud.yaml
@@ -8,9 +8,9 @@ metadata:
     nameOrGUID: "package-ros-cloud"
     version: "v1.0.0"
   project: "project-guid"
+  region: jp
   labels:
     app: test
-    #rapyuta.io/region: us
 spec:
   runtime: cloud # Options: [device, cloud]
   depends:
@@ -38,8 +38,6 @@ spec:
     - depends:
         kind: network
         nameOrGUID: "network-routed-cloud"
-      topics:
-        - "/telemetry"
   managedServices:
     - depends:
         kind: managedservice
@@ -52,7 +50,6 @@ spec:
       trees:
         - config01
         - config02
-      disableSync: false
   rosBagJobs:
     - name: "testbag1" # Required
       recordOptions: # Required

diff --git a/riocli/apply/manifests/deployment-ros-device-no-rosbag.yaml b/riocli/apply/manifests/deployment-ros-device-no-rosbag.yaml
@@ -22,7 +22,6 @@ spec:
       trees:
         - config01
         - config02
-      disableSync: false
   envArgs:
     - name: TEST_KEY
       value: test_value
@@ -41,6 +40,4 @@ spec:
     - depends:
         kind: network
         nameOrGUID: "network-routed-device"
-      topics:
-        - "/telemetry"
       interface: eth0
diff --git a/riocli/apply/manifests/deployment-ros-device-rosbag.yaml b/riocli/apply/manifests/deployment-ros-device-rosbag.yaml
@@ -24,6 +24,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
@@ -32,8 +35,6 @@ spec:
     - depends:
         kind: network
         nameOrGUID: "network-routed-device"
-      topics:
-        - "/telemetry"
       interface: eth0
   rosBagJobs:
     - name: "testbag1" # Required

diff --git a/riocli/apply/manifests/deployment.yaml b/riocli/apply/manifests/deployment.yaml
@@ -8,9 +8,9 @@ metadata:
     nameOrGUID: "package-ros-cloud"
     version: "v1.0.0"
   project: "project-guid"
+  region: jp
   labels:
     app: test
-    #rapyuta.io/region: us
 spec:
   runtime: cloud # Options: [device, cloud]
   depends:
@@ -38,8 +38,6 @@ spec:
     - depends:
         kind: network
         nameOrGUID: "network-routed-cloud"
-      topics:
-        - "/telemetry"
   managedServices:
     - depends:
         kind: managedservice
@@ -52,7 +50,6 @@ spec:
       trees:
         - config01
         - config02
-      disableSync: false
   rosBagJobs:
     - name: "testbag1" # Required
       recordOptions: # Required
@@ -108,9 +105,9 @@ metadata:
     nameOrGUID: "package-nonros-cloud"
     version: "v1.0.0"
   project: "project-guid"
+  region: jp
   labels:
     app: test
-    #rapyuta.io/region: us
 spec:
   runtime: cloud # Options: [device, cloud]
   depends:
@@ -143,7 +140,6 @@ spec:
       trees:
         - config01
         - config02
-      disableSync: false
 ---
 apiVersion: apiextensions.rapyuta.io/v1
 kind: Deployment
@@ -170,6 +166,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
@@ -178,8 +177,6 @@ spec:
     - depends:
         kind: network
         nameOrGUID: "network-routed-device"
-      topics:
-        - "/telemetry"
       interface: eth0
 ---
 apiVersion: apiextensions.rapyuta.io/v1
@@ -207,6 +204,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
@@ -215,8 +215,6 @@ spec:
     - depends:
         kind: network
         nameOrGUID: "network-routed-device"
-      topics:
-        - "/telemetry"
       interface: eth0
   rosBagJobs:
     - name: "testbag1" # Required
@@ -302,4 +300,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
diff --git a/riocli/apply/manifests/network-native-cloud.yaml b/riocli/apply/manifests/network-native-cloud.yaml
@@ -2,9 +2,9 @@ apiVersion: "apiextensions.rapyuta.io/v1"
 kind: "Network"
 metadata:
   name: "network-native-cloud"
+  region: jp
   labels:
     app: test
-    #rapyuta.io/region: us
 spec:
   type: "native" # Required, Options: [routed, native]
   rosDistro: "melodic" # Required, Options: [kinetic, melodic, noetic]

diff --git a/riocli/apply/manifests/network-native-device.yaml b/riocli/apply/manifests/network-native-device.yaml
@@ -9,6 +9,7 @@ spec:
   type: "native" # Required, Options: [routed, native]
   rosDistro: "melodic" # Required, Options: [kinetic, melodic, noetic]
   runtime: "device" # Required, Options: [cloud, device]
-  deviceGUID: "299a436f-9d7f-4bbf-adce-21be06bfbbce" # Required
+  depends: # Required
+    nameOrGuid: device-name
   networkInterface: "eth0" # Required
   restartPolicy: "always" # Options: [always, never, onFailure]
diff --git a/riocli/apply/manifests/network-routed-cloud.yaml b/riocli/apply/manifests/network-routed-cloud.yaml
@@ -3,9 +3,9 @@ kind: "Network"
 metadata:
   name: "network-routed-cloud"
   project: "project-guid"
+  region: jp
   labels:
     app: test
-    #rapyuta.io/region: us
 spec:
   type: "routed" # Required, Options: [routed, native]
   rosDistro: "melodic" # Required, Options: [kinetic, melodic, noetic]

diff --git a/riocli/apply/manifests/network-routed-device.yaml b/riocli/apply/manifests/network-routed-device.yaml
@@ -9,6 +9,7 @@ spec:
   type: "routed" # Required, Options: [routed, native]
   rosDistro: "melodic" # Required, Options: [kinetic, melodic, noetic]
   runtime: "device" # Required, Options: [cloud, device]
-  deviceGUID: "299a436f-9d7f-4bbf-adce-21be06bfbbce" # Required
+  depends: # Required
+    nameOrGuid: device-name
   networkInterface: "eth0" # Required
   restartPolicy: "always" # Options: [always, never, onFailure]
diff --git a/riocli/apply/manifests/network.yaml b/riocli/apply/manifests/network.yaml
@@ -4,9 +4,9 @@ kind: "Network"
 metadata:
   name: "network-routed-cloud"
   project: "project-guid"
+  region: jp
   labels:
     app: test
-    #rapyuta.io/region: us
 spec:
   type: "routed" # Required, Options: [routed, native]
   rosDistro: "melodic" # Required, Options: [kinetic, melodic, noetic]
@@ -26,7 +26,8 @@ spec:
   type: "routed" # Required, Options: [routed, native]
   rosDistro: "melodic" # Required, Options: [kinetic, melodic, noetic]
   runtime: "device" # Required, Options: [cloud, device]
-  deviceGUID: "0eac4320-b36e-4104-b3a9-6bdc2cd37aec" # Required
+  depends: # Required
+    nameOrGuid: device-name
   networkInterface: "eth0" # Required
   restartPolicy: "always" # Options: [always, never, onFailure]
 ---
@@ -35,9 +36,9 @@ kind: "Network"
 metadata:
   name: "network-native-cloud"
   project: "project-guid"
+  region: jp
   labels:
     app: test
-    #rapyuta.io/region: us
 spec:
   type: "native" # Required, Options: [routed, native]
   rosDistro: "melodic" # Required, Options: [kinetic, melodic, noetic]
@@ -57,6 +58,7 @@ spec:
   type: "native" # Required, Options: [routed, native]
   rosDistro: "melodic" # Required, Options: [kinetic, melodic, noetic]
   runtime: "device" # Required, Options: [cloud, device]
-  deviceGUID: "0eac4320-b36e-4104-b3a9-6bdc2cd37aec" # Required
+  depends: # Required
+    nameOrGuid: device-name
   networkInterface: "eth0" # Required
   restartPolicy: "always" # Options: [always, never, onFailure]
diff --git a/riocli/apply/manifests/package-nonros-cloud.yaml b/riocli/apply/manifests/package-nonros-cloud.yaml
@@ -13,10 +13,10 @@ spec:
   executables: # Required
     - name: "exec-docker"
       type: docker # Options: [docker (default), preInstalled]
-      command:
-      - "sleep infinity"
+      command: # Command supports both array and string
+        - "sleep infinity"
+      # command: "sleep infinity"
       runAsBash: True
-      simulation: False
       limits:
         cpu: 0.025 # Unit: Core Options: [Multiple of 0.025, <= 8]
         memory: 128 # Unit: MB Options: [Multiple of 128, <= 32768]

diff --git a/riocli/apply/manifests/package-nonros-device.yaml b/riocli/apply/manifests/package-nonros-device.yaml
@@ -15,8 +15,9 @@ spec:
   executables: # Required
     - name: "exec-docker"
       type: preInstalled # Options: [docker (default), preInstalled]
-      command:
-       - "roslaunch talker talker.launch"
+      command: # Command supports both array and string
+        - "sleep infinity"
+      # command: "sleep infinity"
       runAsBash: True
       limits: # Optional
         cpu: 0.025 # Unit: Core (Optional)
@@ -30,7 +31,6 @@ spec:
         failureThreshold: 1 # Minimum consecutive failures for the probe to be considered failed after having succeeded.
         successThreshold: 3 # Minimum consecutive successes for the probe to be considered successful after having failed.
         timeoutSeconds: 10 # Number of seconds after which the probe times out. Minimun: 10
-
       docker:
         image: "busybox:latest"
         imagePullPolicy: "Always" # Always, Never, IfNotPresent(default)

diff --git a/riocli/apply/manifests/package-ros-cloud.yaml b/riocli/apply/manifests/package-ros-cloud.yaml
@@ -13,10 +13,10 @@ spec:
   executables: # Required
     - name: "exec-docker"
       type: docker # Options: [docker (default), preInstalled]
-      command:
-      - "roslaunch talker talker.launch"
+      command: # Command supports both array and string
+       - "roslaunch talker talker.launch"
+      # command: "roslaunch talker talker.launch"
       runAsBash: True
-      simulation: False
       limits:
         cpu: 0.025 # Unit: Core Options: [Multiple of 0.025, <= 8]
         memory: 128 # Unit: MB Options: [Multiple of 128, <= 32768]
@@ -111,7 +111,6 @@ spec:
   ros:
     enabled: True
     version: melodic # Required, Options: [ kinetic, melodic, noetic ]
-    inboundScopedTargeted: False
     rosEndpoints:
       - type: topic # Required, Options: [ topic, service, action ]
         name: "/telemetry"

diff --git a/riocli/apply/manifests/package-ros-device-no-rosbag.yaml b/riocli/apply/manifests/package-ros-device-no-rosbag.yaml
@@ -15,7 +15,9 @@ spec:
   executables: # Required
     - name: "exec-docker"
       type: docker # Options: [docker (default), preInstalled]
-      command: "roslaunch talker talker.launch"
+      command: # Command supports both array and string
+        - "roslaunch talker talker.launch"
+      # command: "roslaunch talker talker.launch"
       runAsBash: True
       limits: # Optional
         cpu: 0.025 # Unit: Core (Optional)
@@ -52,7 +54,6 @@ spec:
   ros:
     enabled: True
     version: melodic # Required, Options: [ kinetic, melodic, noetic ]
-    inboundScopedTargeted: False
     rosEndpoints:
       - type: topic # Required, Options: [ topic, service, action ]
         name: "/telemetry"

diff --git a/riocli/apply/manifests/package-ros-device-rosbag.yaml b/riocli/apply/manifests/package-ros-device-rosbag.yaml
@@ -15,8 +15,9 @@ spec:
   executables: # Required
     - name: "exec-docker"
       type: docker # Options: [docker (default), preInstalled]
-      command:
-       - "roslaunch talker talker.launch"
+      command: # Command supports both array and string
+        - "roslaunch talker talker.launch"
+      # command: "roslaunch talker talker.launch"
       runAsBash: True
       limits: # Optional
         cpu: 0.025 # Unit: Core (Optional)
@@ -109,7 +110,6 @@ spec:
   ros:
     enabled: True
     version: melodic # Required, Options: [ kinetic, melodic, noetic ]
-    inboundScopedTargeted: False
     rosEndpoints:
       - type: topic # Required, Options: [ topic, service, action ]
         name: "/telemetry"