Merge pull request #2835 from dperny/resource-control

Resource controlapi Implemetation
moby · Feb 26, 2019 · e6e1f60 · e6e1f60
2 parents 4980134 + cc968d9
commit e6e1f60
Show file tree

Hide file tree

Showing 8 changed files with 1,414 additions and 279 deletions.
diff --git a/api/api.pb.txt b/api/api.pb.txt
@@ -6585,6 +6585,7 @@ file {
   dependency: "github.com/docker/swarmkit/api/objects.proto"
   dependency: "github.com/docker/swarmkit/api/types.proto"
   dependency: "gogoproto/gogo.proto"
+  dependency: "google/protobuf/any.proto"
   dependency: "github.com/docker/swarmkit/protobuf/plugin/plugin.proto"
   message_type {
     name: "GetNodeRequest"
@@ -7783,12 +7784,19 @@ file {
   message_type {
     name: "CreateExtensionRequest"
     field {
-      name: "extension"
+      name: "annotations"
       number: 1
       label: LABEL_OPTIONAL
       type: TYPE_MESSAGE
-      type_name: ".docker.swarmkit.v1.Extension"
-      json_name: "extension"
+      type_name: ".docker.swarmkit.v1.Annotations"
+      json_name: "annotations"
+    }
+    field {
+      name: "description"
+      number: 2
+      label: LABEL_OPTIONAL
+      type: TYPE_STRING
+      json_name: "description"
     }
   }
   message_type {
@@ -7839,12 +7847,27 @@ file {
   message_type {
     name: "CreateResourceRequest"
     field {
-      name: "resource"
+      name: "annotations"
       number: 1
       label: LABEL_OPTIONAL
       type: TYPE_MESSAGE
-      type_name: ".docker.swarmkit.v1.Resource"
-      json_name: "resource"
+      type_name: ".docker.swarmkit.v1.Annotations"
+      json_name: "annotations"
+    }
+    field {
+      name: "kind"
+      number: 2
+      label: LABEL_OPTIONAL
+      type: TYPE_STRING
+      json_name: "kind"
+    }
+    field {
+      name: "payload"
+      number: 3
+      label: LABEL_OPTIONAL
+      type: TYPE_MESSAGE
+      type_name: ".google.protobuf.Any"
+      json_name: "payload"
     }
   }
   message_type {
@@ -7874,16 +7897,47 @@ file {
   message_type {
     name: "UpdateResourceRequest"
     field {
-      name: "resource"
+      name: "resource_id"
       number: 1
       label: LABEL_OPTIONAL
+      type: TYPE_STRING
+      json_name: "resourceId"
+    }
+    field {
+      name: "resource_version"
+      number: 2
+      label: LABEL_OPTIONAL
       type: TYPE_MESSAGE
-      type_name: ".docker.swarmkit.v1.Resource"
-      json_name: "resource"
+      type_name: ".docker.swarmkit.v1.Version"
+      json_name: "resourceVersion"
+    }
+    field {
+      name: "annotations"
+      number: 3
+      label: LABEL_OPTIONAL
+      type: TYPE_MESSAGE
+      type_name: ".docker.swarmkit.v1.Annotations"
+      json_name: "annotations"
+    }
+    field {
+      name: "payload"
+      number: 4
+      label: LABEL_OPTIONAL
+      type: TYPE_MESSAGE
+      type_name: ".google.protobuf.Any"
+      json_name: "payload"
     }
   }
   message_type {
     name: "UpdateResourceResponse"
+    field {
+      name: "resource"
+      number: 1
+      label: LABEL_OPTIONAL
+      type: TYPE_MESSAGE
+      type_name: ".docker.swarmkit.v1.Resource"
+      json_name: "resource"
+    }
   }
   message_type {
     name: "GetResourceRequest"
@@ -7948,11 +8002,11 @@ file {
         json_name: "namePrefixes"
       }
       field {
-        name: "extension"
+        name: "kind"
         number: 5
         label: LABEL_OPTIONAL
         type: TYPE_STRING
-        json_name: "extension"
+        json_name: "kind"
       }
       nested_type {
         name: "LabelsEntry"