Merge branch 'master' into executor-allocation

armadaproject · Jul 26, 2019 · 204cd66 · 204cd66
2 parents c8797e3 + 0a83cde
commit 204cd66
Show file tree

Hide file tree

Showing 21 changed files with 889 additions and 251 deletions.
diff --git a/go.mod b/go.mod
@@ -14,6 +14,7 @@ require (
 	github.com/imdario/mergo v0.3.7 // indirect
 	github.com/json-iterator/go v1.1.6 // indirect
 	github.com/kjk/betterguid v0.0.0-20170621091430-c442874ba63a
+	github.com/oklog/ulid v1.3.1
 	github.com/spf13/viper v1.4.0
 	github.com/stretchr/testify v1.3.0
 	github.com/yuin/gopher-lua v0.0.0-20190514113301-1cd887cd7036 // indirect

diff --git a/internal/armada/api/submit.pb.go b/internal/armada/api/submit.pb.go
diff --git a/internal/armada/api/submit.proto b/internal/armada/api/submit.proto
@@ -2,8 +2,10 @@ syntax = 'proto3';
 
 package api;
 
+import "google/protobuf/empty.proto";
 import "k8s.io/api/core/v1/generated.proto";
 
+
 message JobRequest {
     string Queue = 1;
     string JobSetId = 2;
@@ -15,6 +17,12 @@ message JobSubmitResponse {
     string JobId = 1;
 }
 
+message Queue {
+    string Name = 1;
+    double Priority = 2;
+}
+
 service Submit {
     rpc SubmitJob (JobRequest) returns (JobSubmitResponse);
+    rpc CreateQueue (Queue) returns (google.protobuf.Empty);
 }