Skip to content

Update grpc to v1.3.0 and bump protobuf bindings.#33590

Merged
thaJeztah merged 1 commit intomoby:masterfrom
ijc:update-grpc
Jun 9, 2017
Merged

Update grpc to v1.3.0 and bump protobuf bindings.#33590
thaJeztah merged 1 commit intomoby:masterfrom
ijc:update-grpc

Conversation

@ijc
Copy link
Copy Markdown
Contributor

@ijc ijc commented Jun 8, 2017

and update some dependent packages.

We would like to keep moby/moby and swarmkit somewhat in sync here and
moby/swarmkit#2229 proposes a similar bump to
swarmkit, needed due to moby/swarmkit#1965 which
pulls in containerd which uses some newer features of the grpc package.

Signed-off-by: Ian Campbell ian.campbell@docker.com

- What I did

Updated the grpc and protobuf go bindings to correspond to a similar change in moby/swarmkit#2229, primarily to update google.golang.org/grpc from v1.0.4 to v1.3.0. Updated golang.org/x/net and google.golang.org/genproto as a consequence.

I'm raising this PR because AIUI there is a desire to have swarmkit and engine be reasonably in sync with each other wrt grpc versions. Probably this should wait to be merged after the swarmkit change is merged, and possibly this should only be merged alongside (or, better, as part of) a future swarmkit vendor bump. In the meantime getting some CI cycles on the grpc update alone seems useful.

- How I did it

Edited vendor.conf and reran vndr, followed by being pleasantly surprised that no real code changes appeared to be needed.

- How to verify it

I ran the tests (make shell then ./hack/make.sh binary test-unit test-integration-cli test-docker-py).

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

and update some dependent packages.

We would like to keep moby/moby and swarmkit somewhat in sync here and
moby/swarmkit#2229 proposes a similar bump to
swarmkit, needed due to moby/swarmkit#1965 which
pulls in containerd which uses some newer features of the grpc package.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
@aaronlehmann
Copy link
Copy Markdown

Looks like something went wrong with CI, but it's not clear to me whether it had anything to do with these changes. I'll rerun CI.

@aaronlehmann
Copy link
Copy Markdown

LGTM

Copy link
Copy Markdown
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 thaJeztah merged commit 4741c02 into moby:master Jun 9, 2017
@GordonTheTurtle GordonTheTurtle added this to the 17.06.0 milestone Jun 9, 2017
lelenanam added a commit to lelenanam/DockerCuties that referenced this pull request Jun 9, 2017
@ijc ijc deleted the update-grpc branch June 12, 2017 10:03
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.

4 participants