proto

Author: d80tb7

internal/scheduler/schedulerobjects/schedulerobjects.pb.go

@@ -76,6 +76,7 @@ message ResourceList {
 
 // Minimal job representation used by the scheduler.
 message JobSchedulingInfo {
+    reserved  10;
     option (gogoproto.stable_marshaler) = true;
     uint32 lifetime = 1;
     bool at_most_once = 2;
@@ -88,7 +89,7 @@ message JobSchedulingInfo {
     // Kubernetes objects that make up this job and their respective scheduling requirements.
     repeated ObjectRequirements object_requirements = 5;
     uint32 version = 9;
-    // ordinal 10 was previously used for queue_ttl_seconds
+    double price = 11;
 }
 
 // Message capturing the scheduling requirements of a particular Kubernetes object.

internal/scheduler/schedulerobjects/schedulerobjects.proto

@@ -892,6 +892,10 @@ func SwaggerJsonTemplate() string {
 		"            \"$ref\": \"#/definitions/v1PodSpec\"\n" +
 		"          }\n" +
 		"        },\n" +
+		"        \"price\": {\n" +
+		"          \"type\": \"number\",\n" +
+		"          \"format\": \"double\"\n" +
+		"        },\n" +
 		"        \"priority\": {\n" +
 		"          \"type\": \"number\",\n" +
 		"          \"format\": \"double\"\n" +
@@ -905,11 +909,6 @@ func SwaggerJsonTemplate() string {
 		"            \"type\": \"string\"\n" +
 		"          }\n" +
 		"        },\n" +
-		"        \"queueTtlSeconds\": {\n" +
-		"          \"description\": \"Queuing TTL for this job in seconds. If this job queues for more than this duration it will be cancelled. Zero indicates an infinite lifetime.\",\n" +
-		"          \"type\": \"string\",\n" +
-		"          \"format\": \"int64\"\n" +
-		"        },\n" +
 		"        \"requiredNodeLabels\": {\n" +
 		"          \"type\": \"object\",\n" +
 		"          \"additionalProperties\": {\n" +
@@ -1758,6 +1757,10 @@ func SwaggerJsonTemplate() string {
 		"            \"$ref\": \"#/definitions/v1PodSpec\"\n" +
 		"          }\n" +
 		"        },\n" +
+		"        \"price\": {\n" +
+		"          \"type\": \"number\",\n" +
+		"          \"format\": \"double\"\n" +
+		"        },\n" +
 		"        \"priority\": {\n" +
 		"          \"type\": \"number\",\n" +
 		"          \"format\": \"double\"\n" +

pkg/api/api.swagger.go

@@ -881,6 +881,10 @@
             "$ref": "#/definitions/v1PodSpec"
           }
         },
+        "price": {
+          "type": "number",
+          "format": "double"
+        },
         "priority": {
           "type": "number",
           "format": "double"
@@ -894,11 +898,6 @@
             "type": "string"
           }
         },
-        "queueTtlSeconds": {
-          "description": "Queuing TTL for this job in seconds. If this job queues for more than this duration it will be cancelled. Zero indicates an infinite lifetime.",
-          "type": "string",
-          "format": "int64"
-        },
         "requiredNodeLabels": {
           "type": "object",
           "additionalProperties": {
@@ -1747,6 +1746,10 @@
             "$ref": "#/definitions/v1PodSpec"
           }
         },
+        "price": {
+          "type": "number",
+          "format": "double"
+        },
         "priority": {
           "type": "number",
           "format": "double"

pkg/api/api.swagger.json

@@ -12,6 +12,7 @@ import "google/api/annotations.proto";
 import "pkg/api/health.proto";
 
 message JobSubmitRequestItem {
+    reserved 12;
     double priority = 1;
     string namespace = 3;
     string client_id = 8;
@@ -25,7 +26,7 @@ message JobSubmitRequestItem {
     // Indicates which scheduler should manage this job.
     // If empty, the default scheduler is used.
     string scheduler = 11;
-    // Ordinal 12 was previously used for queue_ttl_seconds
+    double price = 13;
 }
 
 message IngressConfig {
@@ -105,6 +106,7 @@ enum JobState {
 }
 
 message Job {
+  reserved 22;
   string id = 1;
   string client_id = 13;
   string job_set_id = 2;
@@ -144,8 +146,7 @@ message Job {
   // Indicates which scheduler should manage this job.
   // If empty, the default scheduler is used.
   string scheduler = 20;
-  // Queuing TTL for this job in seconds. If this job queues for more than this duration it will be cancelled. Zero indicates an infinite lifetime.
-  int64 queue_ttl_seconds = 22;
+  double price = 30;
 }
 
 // swagger:model

pkg/api/submit.pb.go

@@ -156,6 +156,7 @@ message SubmitJob {
     bool isDuplicate = 12;
     // The job id
     string job_id = 14;
+    double price = 15;
 }
 
 // Kubernetes objects that can serve as main objects for an Armada job.