Changes to cluster/filter, swagger.yaml, version-history.md for filte…

…ring on node labels.

Signed-off-by: Anshul Pundir <anshul.pundir@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

api/swagger.yaml

@@ -8609,6 +8609,7 @@ paths:
  - `label=<engine label>`
  - `membership=`(`accepted`|`pending`)`
  - `name=<node name>`
+ - `node.label=<node label>`
  - `role=`(`manager`|`worker`)`
  type: "string"
  tags: ["Node"]

daemon/cluster/filters.go

@@ -16,6 +16,7 @@ func newListNodesFilters(filter filters.Args) (*swarmapi.ListNodesRequest_Filter
  "label": true,
  "role": true,
  "membership": true,
+ "node.label": true,
  }
  if err := filter.Validate(accepted); err != nil {
  return nil, err
@@ -24,6 +25,7 @@ func newListNodesFilters(filter filters.Args) (*swarmapi.ListNodesRequest_Filter
  NamePrefixes: filter.Get("name"),
  IDPrefixes: filter.Get("id"),
  Labels: runconfigopts.ConvertKVStringsToMap(filter.Get("label")),
+ NodeLabels: runconfigopts.ConvertKVStringsToMap(filter.Get("node.label")),
  }
 
  for _, r := range filter.Get("role") {

docs/api/version-history.md

@@ -26,6 +26,10 @@ keywords: "API, Docker, rcli, REST, documentation"
 * `POST /swarm/init` now accepts a `DefaultAddrPool` property to set global scope default address pool
 * `POST /swarm/init` now accepts a `SubnetSize` property to set global scope networks by giving the
  length of the subnet masks for every such network
+* `GET /nodes` now supports a filter type `node.label` filter to filter nodes based
+ on the node.label. The format of the label filter is `node.label=<key>`/`node.label=<key>=<value>`
+ to return those with the specified labels, or `node.label!=<key>`/`node.label!=<key>=<value>`
+ to return those without the specified labels.
 
 ## V1.38 API changes