diff options
| author | Brian Goff <cpuguy83@gmail.com> | 2020-07-23 11:03:15 -0700 |
|---|---|---|
| committer | Brian Goff <cpuguy83@gmail.com> | 2020-07-27 10:09:42 -0700 |
| commit | 24f173a003727611aa482a55b812e0e39c67be65 (patch) | |
| tree | f640a470a7b00ef6510a41b5d1b66c311348d43d /integration/internal | |
| parent | baa321293f74e39442d0c9f88e8d6d3adcb0b418 (diff) | |
| download | docker-24f173a003727611aa482a55b812e0e39c67be65.tar.gz | |
Replace service "Capabilities" w/ add/drop API
After dicussing with maintainers, it was decided putting the burden of
providing the full cap list on the client is not a good design.
Instead we decided to follow along with the container API and use cap
add/drop.
This brings in the changes already merged into swarmkit.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Diffstat (limited to 'integration/internal')
| -rw-r--r-- | integration/internal/swarm/service.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/integration/internal/swarm/service.go b/integration/internal/swarm/service.go index 5e9bb416ef..19ebff0e9a 100644 --- a/integration/internal/swarm/service.go +++ b/integration/internal/swarm/service.go @@ -189,10 +189,11 @@ func ServiceWithSysctls(sysctls map[string]string) ServiceSpecOpt { } // ServiceWithCapabilities sets the Capabilities option of the service's ContainerSpec. -func ServiceWithCapabilities(Capabilities []string) ServiceSpecOpt { +func ServiceWithCapabilities(add []string, drop []string) ServiceSpecOpt { return func(spec *swarmtypes.ServiceSpec) { ensureContainerSpec(spec) - spec.TaskTemplate.ContainerSpec.Capabilities = Capabilities + spec.TaskTemplate.ContainerSpec.CapabilityAdd = add + spec.TaskTemplate.ContainerSpec.CapabilityDrop = drop } } |