Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Match Swarm in how to combine filters 

`docker stack services --filter=label=foo=bar --filter=label=foo=baz my-stack` with Swarm gets handled as `filter on (a label named foo with value bar) AND (a label named foo with value baz).
This obviously yields an empty result set every time, but if and how this should be changed is out of scope here, so simply align Kubernetes with Swarm for now.

Signed-off-by: Mathieu Champlon <mathieu.champlon@docker.com>
This commit is contained in:
Mathieu Champlon 2018-05-24 14:14:37 +02:00
parent 1f7aa1c036
commit 297866ebbe
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cli/command/stack/kubernetes/services.go
View File

@ -24,14 +24,11 @@ var supportedServicesFilters = map[string]bool{
func generateSelector(labels map[string][]string) []string { func generateSelector(labels map[string][]string) []string {
var result []string var result []string
for k, v := range labels { for k, v := range labels {
switch len(v) { for _, val := range v {
case 0: result = append(result, fmt.Sprintf("%s=%s", k, val))
}
if len(v) == 0 {
result = append(result, k) result = append(result, k)
case 1:
result = append(result, fmt.Sprintf("%s=%s", k, v[0]))
default:
sort.Strings(v)
result = append(result, fmt.Sprintf("%s in (%s)", k, strings.Join(v, ",")))
} }
} }
return result return result

3
cli/command/stack/kubernetes/services_test.go
View File

@ -75,7 +75,8 @@ func TestServiceFiltersLabelSelectorGen(t *testing.T) {
), ),
expectedSelectorParts: []string{ expectedSelectorParts: []string{
"com.docker.stack.namespace=test", "com.docker.stack.namespace=test",
"label1 in (test,test2)", "label1=test",
"label1=test2",
}, },
}, },
{ {