Replace swarm Capabilites API with cap add/drop API by cpuguy83 · Pull Request #41249 · moby/moby

cpuguy83 · 2020-07-23T18:08:06Z

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.

This picks up the API changes for cap add/drop for services. Signed-off-by: Brian Goff <[email protected]>

thaJeztah

LGTM

api/swagger.yaml

olljanat · 2020-07-23T18:44:43Z

SGTM

thaJeztah · 2020-07-25T12:31:59Z

Looks like compile is failing;


[2020-07-25T07:30:40.510Z] daemon/oci_windows.go:393:45: too many arguments in call to caps.TweakCapabilities
[2020-07-25T07:30:40.510Z] daemon/oci_windows.go:393:129: c.HostConfig.Capabilities undefined (type *"github.com/docker/docker/api/types/container".HostConfig has no field or method Capabilities)

thaJeztah

LGTM, thanks!

(spotted one typo, but not a blocker)

docs/api/version-history.md

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 <[email protected]>

thaJeztah · 2020-07-27T18:29:05Z

Sigh

[2020-07-27T17:20:11.681Z] go: extracting gotest.tools/gotestsum v0.3.5
[2020-07-27T17:22:54.030Z] verifying gopkg.in/gemnasium/[email protected]/go.mod: gopkg.in/gemnasium/[email protected]/go.mod: Get https://sum.golang.org/lookup/gopkg.in/gemnasium/[email protected]: read tcp 172.21.183.185:49160->216.58.195.81:443: wsarecv: An existing connection was forcibly closed by the remote host.
[2020-07-27T17:22:54.030Z] verifying github.com/mattn/[email protected]/go.mod: github.com/mattn/[email protected]/go.mod: reading https://sum.golang.org/lookup/github.com/mattn/[email protected]: read tcp 172.21.183.185:49160->216.58.195.81:443: wsarecv: An existing connection was forcibly closed by the remote host.
[2020-07-27T17:22:54.030Z] verifying github.com/stretchr/[email protected]/go.mod: github.com/stretchr/[email protected]/go.mod: Get https://sum.golang.org/lookup/github.com/stretchr/[email protected]: read tcp 172.21.183.185:49160->216.58.195.81:443: wsarecv: An existing connection was forcibly closed by the remote host.

thaJeztah · 2020-07-27T19:52:47Z

Looks like this one is flaky again

=== RUN   TestDockerSuite/TestLogsFollowSlowStdoutConsumer
    --- FAIL: TestDockerSuite/TestLogsFollowSlowStdoutConsumer (1.58s)
        docker_cli_logs_test.go:243: assertion failed: error is not nil: exit status 1

thaJeztah · 2020-07-27T23:07:43Z

All green now

full diff: http://github.com/docker/docker/compare/78e6ffd279b627ebba046b9675ff4849091d9cc3...0f41a77c6993ade605a639fb25994cfe5e1b3fe8 Relevant changes: - moby/moby#41234 vendor: update buildkit to 4d1f260e8 - various updates to swagger files - moby/moby#41249 Replace swarm Capabilites API with cap add/drop API - updates swarmkit to 035d564a3686f5e348d861ec0c074ff26854c498 - moby/moby#41254 Deprecate KernelMemory Signed-off-by: Sebastiaan van Stijn <[email protected]>

full diff: http://github.com/docker/docker/compare/78e6ffd279b627ebba046b9675ff4849091d9cc3...0f41a77c6993ade605a639fb25994cfe5e1b3fe8 Relevant changes: - moby/moby#41234 vendor: update buildkit to 4d1f260e8 - various updates to swagger files - moby/moby#41249 Replace swarm Capabilites API with cap add/drop API - updates swarmkit to 035d564a3686f5e348d861ec0c074ff26854c498 - moby/moby#41254 Deprecate KernelMemory Signed-off-by: Sebastiaan van Stijn <[email protected]> Upstream-commit: 097d57314d12c5b2b8dd267353172e51948a25f1 Component: cli

full diff: http://github.com/docker/docker/compare/78e6ffd279b627ebba046b9675ff4849091d9cc3...0f41a77c6993ade605a639fb25994cfe5e1b3fe8 Relevant changes: - moby/moby#41234 vendor: update buildkit to 4d1f260e8 - various updates to swagger files - moby/moby#41249 Replace swarm Capabilites API with cap add/drop API - updates swarmkit to 035d564a3686f5e348d861ec0c074ff26854c498 - moby/moby#41254 Deprecate KernelMemory Signed-off-by: Sebastiaan van Stijn <[email protected]>

dmandalidis · 2020-12-27T09:27:00Z

Placing a note here for anyone falling into this (like me). HostConfig.Capabilities (at least) were released with v1.40, therefore completely dropping them in favour of capAdd/capDrop didn't follow the usual deprecation process. Not a big deal, but I believe that this change was done under the impression that HostConfig.Capabilities were not released at all and their removal wouldn't break anyone. I guess this is also the reason that such change wasn't documented in the release notes of v1.41.

- As per moby/moby#41249

Revendor swarmkit

baa3212

This picks up the API changes for cap add/drop for services. Signed-off-by: Brian Goff <[email protected]>

cpuguy83 requested review from thaJeztah and tonistiigi July 23, 2020 18:08

thaJeztah added area/api API impact/api status/2-code-review impact/changelog labels Jul 23, 2020

cpuguy83 mentioned this pull request Jul 23, 2020

Stack: Support cap_add, cap_drop and privileged on services docker/cli#1940

Closed

thaJeztah approved these changes Jul 23, 2020

View reviewed changes

api/swagger.yaml Outdated Show resolved Hide resolved

tonistiigi approved these changes Jul 23, 2020

View reviewed changes

thaJeztah added the area/swarm label Jul 23, 2020

cpuguy83 force-pushed the swarm_caps branch from 29a67ce to dc3fe51 Compare July 23, 2020 18:32

AkihiroSuda added this to the 20.03.0 milestone Jul 24, 2020

AkihiroSuda added status/4-merge and removed status/2-code-review labels Jul 24, 2020

thaJeztah added status/2-code-review status/failing-ci Indicates that the PR in its current state fails the test suite labels Jul 25, 2020

cpuguy83 force-pushed the swarm_caps branch from dc3fe51 to 12488f6 Compare July 27, 2020 16:52

thaJeztah removed the status/failing-ci Indicates that the PR in its current state fails the test suite label Jul 27, 2020

cpuguy83 force-pushed the swarm_caps branch from 12488f6 to b603fcb Compare July 27, 2020 16:59

thaJeztah approved these changes Jul 27, 2020

View reviewed changes

docs/api/version-history.md Outdated Show resolved Hide resolved

cpuguy83 force-pushed the swarm_caps branch from b603fcb to 24f173a Compare July 27, 2020 17:09

thaJeztah merged commit b36e87a into moby:master Jul 27, 2020

thaJeztah mentioned this pull request Jul 28, 2020

vendor: update docker/docker 0f41a77c6993ade605a639fb25994cfe5e1b3fe8 docker/cli#2659

Merged

thaJeztah mentioned this pull request Sep 22, 2020

Adding the ability to configure default capabilities #39297

Open

dmandalidis added a commit to dmandalidis/docker-client that referenced this pull request Dec 27, 2020

Drop full list of capabilities

ce4972e

- As per moby/moby#41249

dmandalidis added a commit to dmandalidis/docker-client that referenced this pull request Dec 27, 2020

Drop full list of capabilities

7ed9f26

- As per moby/moby#41249

dmandalidis added a commit to dmandalidis/docker-client that referenced this pull request Dec 27, 2020

Drop full list of capabilities

9f902ce

- As per moby/moby#41249

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replace swarm Capabilites API with cap add/drop API#41249

Replace swarm Capabilites API with cap add/drop API#41249
thaJeztah merged 2 commits intomoby:masterfrom
cpuguy83:swarm_caps

cpuguy83 commented Jul 23, 2020

Uh oh!

thaJeztah left a comment

Uh oh!

Uh oh!

olljanat commented Jul 23, 2020

Uh oh!

thaJeztah commented Jul 25, 2020

Uh oh!

thaJeztah left a comment

Uh oh!

Uh oh!

thaJeztah commented Jul 27, 2020

Uh oh!

thaJeztah commented Jul 27, 2020

Uh oh!

thaJeztah commented Jul 27, 2020

Uh oh!

dmandalidis commented Dec 27, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Conversation

cpuguy83 commented Jul 23, 2020

Uh oh!

thaJeztah left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

olljanat commented Jul 23, 2020

Uh oh!

thaJeztah commented Jul 25, 2020

Uh oh!

thaJeztah left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

thaJeztah commented Jul 27, 2020

Uh oh!

thaJeztah commented Jul 27, 2020

Uh oh!

thaJeztah commented Jul 27, 2020

Uh oh!

dmandalidis commented Dec 27, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants