feat(package): adds provision to specify pull policy for docker image

rapyuta-robotics · Jun 8, 2023 · 42ca473 · 42ca473
1 parent b5ec154
commit 42ca473
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 0 deletions.
diff --git a/riocli/apply/manifests/package-nonros-device.yaml b/riocli/apply/manifests/package-nonros-device.yaml
@@ -33,6 +33,7 @@ spec:
         memory: 128 # Unit: MB (Optional)
       docker:
         image: "busybox:latest"
+        imagePullPolicy: "Always" # Always, Never, IfNotPresent(default)
         pullSecret:
           depends:
             kind: secret

diff --git a/riocli/apply/manifests/package-ros-device-no-rosbag.yaml b/riocli/apply/manifests/package-ros-device-no-rosbag.yaml
@@ -34,6 +34,7 @@ spec:
         memory: 128 # Unit: MB (Optional)
       docker:
         image: "busybox:latest"
+        imagePullPolicy: "Always" # Always, Never, IfNotPresent(default)
         pullSecret:
           depends:
             kind: secret

diff --git a/riocli/apply/manifests/package-ros-device-rosbag.yaml b/riocli/apply/manifests/package-ros-device-rosbag.yaml
@@ -34,6 +34,7 @@ spec:
         memory: 128 # Unit: MB (Optional)
       docker:
         image: "busybox:latest"
+        imagePullPolicy: "Always" # Always, Never, IfNotPresent(default)
         pullSecret:
           depends:
             kind: secret

diff --git a/riocli/apply/manifests/package.yaml b/riocli/apply/manifests/package.yaml
@@ -179,6 +179,7 @@ spec:
         memory: 128 # Unit: MB (Optional)
       docker:
         image: "busybox:latest"
+        imagePullPolicy: "Always" # Always, Never, IfNotPresent(default)
         pullSecret:
           depends:
             kind: secret
@@ -389,6 +390,7 @@ spec:
         memory: 128 # Unit: MB (Optional)
       docker:
         image: "busybox:latest"
+        imagePullPolicy: "Always" # Always, Never, IfNotPresent(default)
         pullSecret:
           depends:
             kind: secret
@@ -442,6 +444,7 @@ spec:
         memory: 128 # Unit: MB (Optional)
       docker:
         image: "busybox:latest"
+        imagePullPolicy: "Always" # Always, Never, IfNotPresent(default)
         pullSecret:
           depends:
             kind: secret

diff --git a/riocli/jsonschema/schemas/package-schema.yaml b/riocli/jsonschema/schemas/package-schema.yaml
@@ -150,6 +150,8 @@ definitions:
                 properties:
                   image:
                     "$ref": "#/definitions/imageName"
+                  imagePullPolicy:
+                    "$ref": "#/definitions/imagePullPolicy"
                   pullSecret:
                     "$ref": "#/definitions/secretDepends"
                 required:
@@ -660,6 +662,13 @@ definitions:
   imageName:
     type: string
     pattern: ^([a-zA-Z0-9])([\w.\-_]+((?::\d+|)(?=/[a-z0-9._-]+/[a-z0-9._-]+))|)(?:/|)([a-z0-9.\-_]+(?:/[a-z0-9.\-_]+|))(:([\w.\-_]{1,126})|)$
+  imagePullPolicy:
+    type: string
+    enum:
+      - Always
+      - IfNotPresent
+      - Never
+    default: IfNotPresent
 
   buildDepends:
     properties:

diff --git a/riocli/package/model.py b/riocli/package/model.py
@@ -212,6 +212,9 @@ def _map_executable(self, exec):
                 secret_guid, secret = self.rc.find_depends(exec.docker.pullSecret.depends)
                 exec_object.secret = secret_guid
 
+            if exec.docker.get('imagePullPolicy'):
+                exec_object.imagePullPolicy = exec.docker.imagePullPolicy
+
         if exec.type == 'build':
             exec_object.buildGUID = exec.build.depends.guid
             # TODO verify this is right for secret?