Merge branch 'master' of git.curoverse.com:arvados into 13330-cwl-intermediate-collec...

[arvados.git] / sdk / go / arvados / container.go

diff --git a/sdk/go/arvados/container.go b/sdk/go/arvados/container.go
index a541a8dca77fb03b9d6728fd8c9c13c5836414c8..210ed9981c07292ec3c1508da978eaac351acae7 100644 (file)
--- a/sdk/go/arvados/container.go
+++ b/sdk/go/arvados/container.go
@@ -4,9 +4,12 @@
 
 package arvados
 
+import "time"
+
 // Container is an arvados#container resource.
 type Container struct {
        UUID                 string               `json:"uuid"`
+       CreatedAt            time.Time            `json:"created_at"`
        Command              []string             `json:"command"`
        ContainerImage       string               `json:"container_image"`
        Cwd                  string               `json:"cwd"`
@@ -41,15 +44,17 @@ type Mount struct {
 // CPU) and network connectivity.
 type RuntimeConstraints struct {
        API          *bool
-       RAM          int `json:"ram"`
-       VCPUs        int `json:"vcpus"`
-       KeepCacheRAM int `json:"keep_cache_ram"`
+       RAM          int64 `json:"ram"`
+       VCPUs        int   `json:"vcpus"`
+       KeepCacheRAM int64 `json:"keep_cache_ram"`
 }
 
 // SchedulingParameters specify a container's scheduling parameters
 // such as Partitions
 type SchedulingParameters struct {
-       Partitions []string `json:"partitions"`
+       Partitions  []string `json:"partitions"`
+       Preemptible bool     `json:"preemptible"`
+       MaxRunTime  int      `json:"max_run_time"`
 }
 
 // ContainerList is an arvados#containerList resource.