Skip to content

Update vendored packages, containerd, docker#2560

Merged
cyli merged 20 commits into
moby:masterfrom
thaJeztah:update-vendored-files
Mar 20, 2018
Merged

Update vendored packages, containerd, docker#2560
cyli merged 20 commits into
moby:masterfrom
thaJeztah:update-vendored-files

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

This updates a big part of the vendored packages to match what's used in https://github.com/moby/moby (I kept out some, such as Cobra, and some helper packages). This makes sure that this repository is developing and testing using the same(ish) version of those packages.

Last four commits update containerd (first to 1.0.2, then to 3fa104f843ec92328912e042b767d26825f202aa); did an attempt to fix up local changes needed for changes in there; it builds with those changes, but quite possibly may need more changes

Named this "WIP", as I'm sure I screwed up somewhere 😂

Updated packages

New dependencies

  • github.com/ishidawataru/sctp
  • github.com/containerd/typeurl

Already ahead

@thaJeztah
Copy link
Copy Markdown
Member Author

time="2018-03-15T21:54:38Z" level=info msg="22565b52988a5be2 is starting a new election at term 4" module=raft testHasExternalCA=false testname=TestManagerEncryptsDecryptsRootKeyMaterial
time="2018-03-15T21:54:38Z" level=info msg="22565b52988a5be2 became candidate at term 5" module=raft testHasExternalCA=false testname=TestManagerEncryptsDecryptsRootKeyMaterial
time="2018-03-15T21:54:38Z" level=info msg="22565b52988a5be2 received MsgVoteResp from 22565b52988a5be2 at term 5" module=raft testHasExternalCA=false testname=TestManagerEncryptsDecryptsRootKeyMaterial
time="2018-03-15T21:54:38Z" level=info msg="22565b52988a5be2 became leader at term 5" module=raft testHasExternalCA=false testname=TestManagerEncryptsDecryptsRootKeyMaterial
time="2018-03-15T21:54:38Z" level=info msg="raft.node: 22565b52988a5be2 elected leader 22565b52988a5be2 at term 5" module=raft testHasExternalCA=false testname=TestManagerEncryptsDecryptsRootKeyMaterial
time="2018-03-15T21:54:38Z" level=error msg="error creating cluster object" error="name conflicts with an existing object" testHasExternalCA=false testname=TestManagerEncryptsDecryptsRootKeyMaterial
time="2018-03-15T21:54:38Z" level=error msg="failed to create predefined network bridge" error="name conflicts with an existing object" testHasExternalCA=false testname=TestManagerEncryptsDecryptsRootKeyMaterial
time="2018-03-15T21:54:38Z" level=error msg="failed to create predefined network host" error="name conflicts with an existing object" testHasExternalCA=false testname=TestManagerEncryptsDecryptsRootKeyMaterial
time="2018-03-15T21:54:38Z" level=info msg="Updating the encryption on the root key material of cluster 6ruorplb8zek8su588d6xguvx" testHasExternalCA=false testname=TestManagerEncryptsDecryptsRootKeyMaterial
time="2018-03-15T21:54:38Z" level=info msg="Stopping manager" testHasExternalCA=false testname=TestManagerEncryptsDecryptsRootKeyMaterial
time="2018-03-15T21:54:38Z" level=info msg="dispatcher starting" module=dispatcher testHasExternalCA=false testname=TestManagerEncryptsDecryptsRootKeyMaterial
time="2018-03-15T21:54:38Z" level=info msg="leadership changed from not yet part of a raft cluster to ch6scvl6j7l7q7mvv1e9gvqme" testHasExternalCA=false testname=TestManagerEncryptsDecryptsRootKeyMaterial
time="2018-03-15T21:54:38Z" level=info msg="dispatcher stopping" method="(*Dispatcher).Stop" module=dispatcher testHasExternalCA=false testname=TestManagerEncryptsDecryptsRootKeyMaterial
time="2018-03-15T21:54:38Z" level=error msg="failed committing allocation of ingress network during init" error="context canceled" testHasExternalCA=false testname=TestManagerEncryptsDecryptsRootKeyMaterial
time="2018-03-15T21:54:38Z" level=error msg="wait context cancelled" error="context canceled"
time="2018-03-15T21:54:38Z" level=error msg="wait context cancelled but node is still a leader"
time="2018-03-15T21:54:38Z" level=error msg="failed committing allocation of networks during init" error="raft: failed to process the request: node lost leader status" testHasExternalCA=false testname=TestManagerEncryptsDecryptsRootKeyMaterial
time="2018-03-15T21:54:38Z" level=error msg="wait cancelled"
time="2018-03-15T21:54:38Z" level=error msg="wait cancelled but node is still a leader"
time="2018-03-15T21:54:38Z" level=error msg="Failed to commit allocation of network resources for nodes" error="raft: failed to process the request: node lost leader status" testHasExternalCA=false testname=TestManagerEncryptsDecryptsRootKeyMaterial
time="2018-03-15T21:54:38Z" level=info msg="Manager shut down" testHasExternalCA=false testname=TestManagerEncryptsDecryptsRootKeyMaterial
FAIL

Don't know if this is just due to flakiness or something else

@thaJeztah thaJeztah requested a review from ijc March 15, 2018 21:57
@thaJeztah
Copy link
Copy Markdown
Member Author

/cc @ijc @vdemeester @stevvooe

Copy link
Copy Markdown
Member

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🐯

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Mar 16, 2018

Let me remove "WIP", as it seems to be going 😄

Be sure to double check a4fcc8e and 33431b4 (for the local changes)

/cc @dnephin who I think is most familiar with that refactor 😅

@thaJeztah thaJeztah changed the title [WIP] Update vendored packages, containerd, docker Update vendored packages, containerd, docker Mar 16, 2018
@thaJeztah thaJeztah force-pushed the update-vendored-files branch from 5694e2e to 6a8e432 Compare March 16, 2018 10:10
@codecov
Copy link
Copy Markdown

codecov Bot commented Mar 16, 2018

Codecov Report

Merging #2560 into master will decrease coverage by 0.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #2560      +/-   ##
==========================================
- Coverage   61.35%   61.33%   -0.02%     
==========================================
  Files         133      133              
  Lines       21765    21765              
==========================================
- Hits        13354    13350       -4     
- Misses       6974     6983       +9     
+ Partials     1437     1432       -5

Copy link
Copy Markdown
Contributor

@ijc ijc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@cyli
Copy link
Copy Markdown
Contributor

cyli commented Mar 16, 2018

Thanks for updating this @thaJeztah - looks like the github.com/docker/docker/pkg/plugingetter.CompatPlugin interface had a ScopedPath method added to it, which breaks one of the tests currently. Perhaps an empty method could be added to the mock plugin getter in that test file?

# github.com/docker/swarmkit/manager/dispatcher
manager/dispatcher/dispatcher_test.go:2065:11: cannot use NewMockPlugin(m.name, client) (type *MockPlugin) as type plugingetter.CompatPlugin in assignment:
	*MockPlugin does not implement plugingetter.CompatPlugin (missing ScopedPath method)
FAIL	github.com/docker/swarmkit/manager/dispatcher [build failed]

@thaJeztah
Copy link
Copy Markdown
Member Author

@cyli oh, thanks! I knew I'd break something, and must've missed that in the CI output 🤗 I'll try to updated asap.

This make the vendored version in sync with moby/moby;
no code changes, only changes in documentation

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Updates containerd/fifo to fbfb6a11ec671efbe94ad1c12c2e98773f19e1e6,
to keep it in sync with the Moby repository, and to
prevent a data race when Close is called concurrently

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This make the vendored version in sync with moby/moby

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
on moby CI, this fixed an issue that was blocking a test from running on ppc64le.

This make the vendored version in sync with moby/moby

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This make the vendored version in sync with moby/moby

- LCOW: Dynamic sandbox management
- pipe: Resolve race between close and connect

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This make the vendored version in sync with moby/moby;

  - Allow the config API consumer to modify the serv/client default configs
  - Support parsing SCTP port mapping

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This make the vendored version in sync with moby/moby;

 - Refactor implementation of ParseUlimit function
 - Enhance FromHumanSize to parse float64 string
 - Unify license: Use one license for documentation and code
 - make 1 second not to be plural seconds
 - change week display rule
 - Better human duration precision
 - Removes spaces before unit to be closer to common Linux outputs.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This make the vendored version in sync with moby/moby;
no code changes

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Updates to 346938d642f2ec3594ed81d874461961cd0faa76 (v1.1.0),

This make the vendored version in sync with moby/moby;

dds new config options (`DisablePointerAddresses`, `DisableCapacities`)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
…c0b6506826e

This make the vendored version in sync with moby/moby

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This make the vendored version in sync with moby/moby;
Adds support for for etcd authentication

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This make the vendored version in sync with moby/moby;

- reference: allow more than 1 digest algorithm separator

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This make the vendored version in sync with moby/moby

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This makes the vendored version in sync with moby/moby

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This makes the vendored version in sync with moby/moby

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the update-vendored-files branch from 6a8e432 to 33431b4 Compare March 16, 2018 16:56
}
func (m *MockPlugin) ScopedPath(_ string) string {
return ""
}
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added here 👍

@thaJeztah
Copy link
Copy Markdown
Member Author

Updated 🎉 fingers crossed

Copy link
Copy Markdown
Contributor

@cyli cyli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM - thanks for updating these and including the links to all the changes! I mostly looked at the certificate transparency and golang/x/crypto changes.

@cyli
Copy link
Copy Markdown
Contributor

cyli commented Mar 16, 2018

As a note we may have to bump the certificate transparency package for go 1.10: #2563, but that doesn't need to happen in this PR. Just wanted to mention it in case it's useful elsewhere as well.

@thaJeztah
Copy link
Copy Markdown
Member Author

Ah, yes, I saw that issue as well on my machine. This PR’s intent was to have the dependencies in sync, but I was considering having a look at dependencies in general, to update them across the board (some haven’t been updated for a while, so worth checking if we’re missing out on fixes)

@cyli cyli merged commit e076f30 into moby:master Mar 20, 2018
@thaJeztah thaJeztah deleted the update-vendored-files branch March 20, 2018 23:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants