Renamed Generic Resources to match Moby PR #2292
Conversation
Codecov Report
@@ Coverage Diff @@
## master #2292 +/- ##
==========================================
- Coverage 61.29% 61.14% -0.16%
==========================================
Files 128 128
Lines 20549 20549
==========================================
- Hits 12596 12564 -32
- Misses 6574 6606 +32
Partials 1379 1379 |
|
LGTM ping @stevvooe |
api/types.proto
Outdated
| string kind = 1; | ||
| string value = 2; | ||
| } | ||
|
|
||
| message GenericDiscrete { | ||
| message DiscreteGenericResource { | ||
| string kind = 1; | ||
| int64 value = 2; | ||
| } | ||
|
|
||
| message GenericResource { | ||
| oneof resource { |
There was a problem hiding this comment.
@aaronlehmann Is there any reason we would want to use an Any vs oneof here?
There was a problem hiding this comment.
I don't think it would make sense to use Any here. The scheduler needs to understand these so it can perform accounting of resource availability on nodes.
api/types.proto
Outdated
| @@ -30,20 +30,20 @@ message Annotations { | |||
| repeated IndexEntry indices = 4 [(gogoproto.nullable) = false]; | |||
| } | |||
|
|
|||
| message GenericString { | |||
| message NamedGenericResource { | |||
There was a problem hiding this comment.
Make sure to document what these are.
|
LGTM after docs (its also okay to move on and doc in another PR). |
|
Added doc |
|
Looks like you need to rerun |
Renamed: - Str -> NamedResourceSpec - Discrete -> DiscreteResourceSpec - GenericString -> NamedGenericResource - GenericDiscrete -> DiscreteGenericResource Signed-off-by: Renaud Gaubert <rgaubert@nvidia.com>
|
Ok did not expect comments to need to regenerate :) |
|
I'm looking at the vendoring of the moby project :) @aaronlehmann it seems to me that the only commit that has an impact on moby is 9cbc2cc And that I should only need to mirror the changes to the executor and that should be it. Does that sound right to you ? |
|
Sorry about that. Yes, mirroring those changes would be ideal, but if it's nontrivial to implement or test, feel free to pass |
- moby/swarmkit#2266 (support for templating Node.Hostname in docker executor) - moby/swarmkit#2281 (change restore action on objects to be update, not delete/create) - moby/swarmkit#2285 (extend watch queue with timeout and size limit) - moby/swarmkit#2253 (version-aware failure tracking in the scheduler) - moby/swarmkit#2275 (update containerd and port executor to container client library) - moby/swarmkit#2292 (rename some generic resources) - moby/swarmkit#2300 (limit the size of the external CA response) - moby/swarmkit#2301 (delete global tasks when the node running them is deleted) Minor cleanups, dependency bumps, and vendoring: - moby/swarmkit#2271 - moby/swarmkit#2279 - moby/swarmkit#2283 - moby/swarmkit#2282 - moby/swarmkit#2274 - moby/swarmkit#2296 (dependency bump of etcd, go-winio) Signed-off-by: Ying Li <ying.li@docker.com> Upstream-commit: 4509a00 Component: engine
- moby/swarmkit#2266 (support for templating Node.Hostname in docker executor) - moby/swarmkit#2281 (change restore action on objects to be update, not delete/create) - moby/swarmkit#2285 (extend watch queue with timeout and size limit) - moby/swarmkit#2253 (version-aware failure tracking in the scheduler) - moby/swarmkit#2275 (update containerd and port executor to container client library) - moby/swarmkit#2292 (rename some generic resources) - moby/swarmkit#2300 (limit the size of the external CA response) - moby/swarmkit#2301 (delete global tasks when the node running them is deleted) Minor cleanups, dependency bumps, and vendoring: - moby/swarmkit#2271 - moby/swarmkit#2279 - moby/swarmkit#2283 - moby/swarmkit#2282 - moby/swarmkit#2274 - moby/swarmkit#2296 (dependency bump of etcd, go-winio) Signed-off-by: Ying Li <ying.li@docker.com> Upstream-commit: 4509a00 Component: engine
Moby PR that matches this feature: moby/moby#33440
Renamed:
Hopefully this will move the moby PR forward and we can start working on CLI integration, compose integration, swarmkit constraints, resource discovery, ...
Ping @aaronlehmann @dongluochen @aluzzardi
Thanks!
Signed-off-by: Renaud Gaubert rgaubert@nvidia.com