Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update godep to pull from containernetworking/cni #28859

Merged
merged 1 commit into from
Aug 20, 2016
Merged

update godep to pull from containernetworking/cni #28859

merged 1 commit into from
Aug 20, 2016

Conversation

freehan
Copy link
Contributor

@freehan freehan commented Jul 12, 2016 •
edited by k8s-oncall
Loading

WIP

This change is Reviewable

@freehan freehan added the release-note-none Denotes a PR that doesn't merit a release note. label Jul 12, 2016
@freehan freehan self-assigned this Jul 12, 2016
@k8s-github-robot k8s-github-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jul 12, 2016
@freehan
Copy link
Contributor Author

freehan commented Jul 12, 2016

@k8s-bot test this issue: #28569

@luxas
Copy link
Member

luxas commented Jul 13, 2016

/cc

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 20, 2016
@luxas luxas self-assigned this Aug 14, 2016
@luxas
Copy link
Member

luxas commented Aug 14, 2016

@freehan Please rebase this now so we may get the latest libcni changes into Kubernetes.
BTW, we should also build new binaries from current HEAD.

@freehan
Copy link
Contributor Author

freehan commented Aug 18, 2016

rebased

@k8s-github-robot k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 18, 2016
@luxas
Copy link
Member

luxas commented Aug 18, 2016

@freehan Could you please update to containernetworking/cni@9d5e6e6 (current HEAD)?

verify-godeps also broken right now.
I think this is something we want in v1.4, so adding the milestone. Remove if you strongly disagree

@luxas luxas added this to the v1.4 milestone Aug 18, 2016
@freehan
Copy link
Contributor Author

freehan commented Aug 18, 2016

This PR is mainly updating the libcni though.

Will push a separate PR for cni binary

@luxas
Copy link
Member

luxas commented Aug 18, 2016

Yep, but I'd also like libcni be at HEAD (since they introduced a function called InjectConf that we're gonna use)

But yes, binaries should be uploaded again, but for all arches: amd64, arm, arm64 and ppc64le!

@freehan
Copy link
Contributor Author

freehan commented Aug 18, 2016

@luxas PTAL

@luxas
Copy link
Member

luxas commented Aug 19, 2016

LGTM

@luxas luxas added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 19, 2016
@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 19, 2016
@luxas luxas removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 19, 2016
@luxas
Copy link
Member

luxas commented Aug 19, 2016

@freehan Unfortunately needs a rebase, ping me when you've done that

@freehan freehan added the priority/backlog Higher priority than priority/awaiting-more-evidence. label Aug 19, 2016
@k8s-github-robot k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 19, 2016
@freehan
Copy link
Contributor Author

freehan commented Aug 19, 2016

bumping priority due to 2 rebases

@luxas luxas added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 19, 2016
@k8s-bot
Copy link

k8s-bot commented Aug 19, 2016

GCE e2e build/test passed for commit 85b2f90.

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Aug 20, 2016

GCE e2e build/test passed for commit 85b2f90.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 2da7f95 into kubernetes:master Aug 20, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@freehan freehan

@luxas luxas

Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/backlog Higher priority than priority/awaiting-more-evidence. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.4
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@freehan @luxas @k8s-bot @k8s-github-robot @googlebot