Skip to content

vendor: bump etcd to v3.3.9#37805

Merged
yongtang merged 2 commits intomoby:masterfrom
kolyshkin:bump-etcd
Sep 15, 2018
Merged

vendor: bump etcd to v3.3.9#37805
yongtang merged 2 commits intomoby:masterfrom
kolyshkin:bump-etcd

Conversation

@kolyshkin
Copy link
Contributor

@kolyshkin kolyshkin commented Sep 8, 2018

...and use ugorji/go 1.1.1

While at it, update etcd deps.

Fixes #37804

@AkihiroSuda
Copy link
Member

06:43:55 ---> Making bundle: binary-daemon (in bundles/binary-daemon)
06:43:55 Building: bundles/binary-daemon/dockerd-dev
06:44:31 # github.com/docker/docker/vendor/github.com/ugorji/go/codec
06:44:31 vendor/github.com/ugorji/go/codec/decode.go:1026:7: undefined: reflectArrayOfSupported
06:44:31 vendor/github.com/ugorji/go/codec/decode.go:1027:25: undefined: reflectArrayOf
06:44:31 vendor/github.com/ugorji/go/codec/decode.go:1478:10: undefined: makeMapReflect
06:44:31 vendor/github.com/ugorji/go/codec/helper.go:1300:40: undefined: allowSetUnexportedEmbeddedPtr
06:44:55 Build step 'Execute shell' marked build as failure

@AkihiroSuda AkihiroSuda added the status/failing-ci Indicates that the PR in its current state fails the test suite label Sep 10, 2018
@kolyshkin
Copy link
Contributor Author

forgot to do git add after vndr -- fixed

@codecov
Copy link

codecov bot commented Sep 10, 2018

Codecov Report

❗ No coverage uploaded for pull request base (master@11841b7). Click here to learn what that means.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             master   #37805   +/-   ##
=========================================
  Coverage          ?   36.16%           
=========================================
  Files             ?      610           
  Lines             ?    45054           
  Branches          ?        0           
=========================================
  Hits              ?    16292           
  Misses            ?    26523           
  Partials          ?     2239

@kolyshkin
Copy link
Contributor Author

rebased (mostly to re-run CI)

@kolyshkin
Copy link
Contributor Author

TestAPISwarmLeaderElection failure on janky and experimental CI (context deadline exceeded). This is a well known flaky test (#32673).

@kolyshkin
Copy link
Contributor Author

temporary included #37833 to investigate TestAPISwarmLeaderElection failure.

...and use ugorji/go 1.1.1

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
As per https://github.com/etcd-io/etcd/blob/fa57f7fbc787b4/Gopkg.lock

List of packages required by subset of etcd used is provided by:

go list -f '{{join .Deps "\n"}}' \
 github.com/docker/docker/vendor/github.com/coreos/etcd/... \
 | grep -F . | grep -v coreos/etcd | sort | uniq

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@thaJeztah thaJeztah added status/2-code-review and removed status/0-triage status/failing-ci Indicates that the PR in its current state fails the test suite labels Sep 13, 2018
Copy link
Member

@thaJeztah thaJeztah 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
Member

oh, we should probably remove that other commit before merging 😅

@kolyshkin
Copy link
Contributor Author

oh, we should probably remove that other commit before merging 

🗑️ done

Copy link
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 🐸

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants