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

Migrate the docker client code from dockertools to dockershim #45307

Merged
merged 3 commits into from
May 10, 2017
Merged

Migrate the docker client code from dockertools to dockershim #45307

merged 3 commits into from
May 10, 2017

Conversation

yujuhong
Copy link
Contributor

@yujuhong yujuhong commented May 3, 2017 •
edited

Move docker client code from dockertools to dockershim/libdocker. This includes
DockerInterface (renamed to Interface), FakeDockerClient, etc.

This is part of #43234

@yujuhong yujuhong added kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. sig/node Categorizes an issue or PR as relevant to SIG Node. labels May 3, 2017
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 3, 2017
@yujuhong yujuhong added release-note-none Denotes a PR that doesn't merit a release note. and removed cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels May 3, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@k8s-github-robot k8s-github-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. release-note-label-needed labels May 3, 2017
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 3, 2017
@yujuhong yujuhong added this to the v1.7 milestone May 3, 2017
@yujuhong yujuhong force-pushed the mv-docker-client branch 2 times, most recently from 50e9662 to 3e03d7a Compare May 3, 2017 22:27
@yujuhong
Copy link
Contributor Author

yujuhong commented May 3, 2017

@k8s-bot unit test this

@yujuhong
Copy link
Contributor Author

yujuhong commented May 3, 2017

k @k8s-bot unit test this

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 4, 2017
@k8s-github-robot k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 4, 2017
@yujuhong
Copy link
Contributor Author

yujuhong commented May 4, 2017

Rebased. PTAL!

@yujuhong yujuhong mentioned this pull request May 4, 2017
Merged
@yujuhong
Copy link
Contributor Author

yujuhong commented May 4, 2017

@k8s-bot kubemark e2e test this

1 similar comment
@feiskyer
Copy link
Member

feiskyer commented May 5, 2017

@k8s-bot kubemark e2e test this

@yujuhong
Move docker client code from dockertools to dockershim/dockerlib
389c140 
The code affected include DockerInterface (renamed to Interface),
FakeDockerClient, etc.
@yujuhong
Move legacy log symlink to kuberuntime
8cc4b3a 
Also remove the dockertools.DockerType constant.
@yujuhong
Update bazel BUID files
cf3635c
@yujuhong
Copy link
Contributor Author

yujuhong commented May 5, 2017

@k8s-bot bazel test this

@yujuhong
Copy link
Contributor Author

yujuhong commented May 5, 2017

@k8s-bot verify test this

@dchen1107
Copy link
Member

/approve

I will leave @Random-Liu to review this pr in detail. Thanks!

@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dchen1107, yujuhong

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 9, 2017
Random-Liu
Random-Liu reviewed May 9, 2017
View reviewed changes
Copy link
Member

@Random-Liu Random-Liu left a comment

Choose a reason for hiding this comment

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

Except changing dockertools to libdocker, did you only move things around?

Did you make any actual change? If not, the PR LGTM already. :)

pkg/kubelet/sysctl/runtime.go
)

// TODO: The admission logic in this file is runtime-dependent. It should be
// changed to be generic and CRI-compatible.

Copy link
Member

Choose a reason for hiding this comment

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

Extra empty line

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The comment was intended for the entire file, not just the struct below. Hence the extra line for separation.

Copy link
Member

Choose a reason for hiding this comment

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

SGTM

@yujuhong
Copy link
Contributor Author

yujuhong commented May 9, 2017

Except changing dockertools to libdocker, did you only move things around?

Did you make any actual change? If not, the PR LGTM already. :)

No functional changes. I only made decisions about where the code should reside :-)

@yujuhong
Copy link
Contributor Author

Applying lgtm based on @Random-Liu's review.

@yujuhong yujuhong added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 10, 2017
@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 45453, 45307, 44987)

@k8s-github-robot k8s-github-robot merged commit 51a3413 into kubernetes:master May 10, 2017
@yujuhong yujuhong deleted the mv-docker-client branch May 19, 2017 16:56
@yujuhong yujuhong mentioned this pull request Aug 17, 2017
Closed
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Random-Liu Random-Liu Random-Liu left review comments

Assignees

@Random-Liu Random-Liu

@dchen1107 dchen1107

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. sig/node Categorizes an issue or PR as relevant to SIG Node. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
v1.7
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@yujuhong @k8s-reviewable @feiskyer @dchen1107 @k8s-github-robot @Random-Liu @k8s-ci-robot