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.

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

dockershim: remove the use of kubelet's internal API #58548

Merged
merged 4 commits into from Jan 20, 2018
Merged

dockershim: remove the use of kubelet's internal API #58548

merged 4 commits into from Jan 20, 2018

Conversation

yujuhong
Copy link
Member

We let dockershim implement the kubelet's internal (CRI) API as an
intermediary step before transitioning fully to communicate using gRPC.
Now that kubelet has been communicating to the runtime over gRPC for
multiple releases, we can safely retire the extra interface in
dockershim.

This PR also moves the legacy functions to a separate file and clean up
the interfaces.

@yujuhong yujuhong self-assigned this Jan 19, 2018
@k8s-ci-robot
Copy link
Contributor

@yujuhong: Adding do-not-merge/release-note-label-needed because the release note process has not been followed.

One of the following labels is required "release-note", "release-note-action-required", or "release-note-none".
Please see: https://git.k8s.io/community/contributors/devel/pull-requests.md#write-release-notes-if-needed.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jan 19, 2018
@yujuhong yujuhong changed the title dockershim: remove the use if kubelet's internal API dockershim: remove the use of kubelet's internal API Jan 19, 2018
@yujuhong yujuhong added release-note-none Denotes a PR that doesn't merit a release note. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Jan 19, 2018
@yujuhong
Copy link
Member Author

/approve no-issue

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 19, 2018
@yujuhong
Copy link
Member Author

/test pull-kubernetes-node-e2e

@yujuhong yujuhong force-pushed the simplify-ds branch 2 times, most recently from 4fadb1e to adc2e94 Compare January 20, 2018 00:23
@k8s-ci-robot k8s-ci-robot removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 20, 2018
@yujuhong
dockershim: remove the use of kubelet's internal API
e8da890 
We let dockershim implement the kubelet's internal (CRI) API as an
intermediary step before transitioning fully to communicate using gRPC.
Now that kubelet has been communicating to the runtime over gRPC for
multiple releases, we can safely retire the extra interface in
dockershim.
@yujuhong
Fix all the unit tests and update the bazel files
2091028
@yujuhong
dockershim: call DockerService.Start() during grpc server startup
9728c56
@yujuhong yujuhong assigned Random-Liu and unassigned yujuhong Jan 20, 2018
@yujuhong
Copy link
Member Author

I removed dockershim/remote from hack/.golint_failures. As a result of this, I'd need the approval from an owner of the hack package.
/assign @ixdy
help?

Random-Liu
Random-Liu reviewed Jan 20, 2018
View reviewed changes
pkg/kubelet/dockershim/docker_legacy_service.go Outdated
kuberuntime.LegacyLogProvider
}

// NewDockerLegacyService created docker legacy service when log driver is not supported.
Copy link
Member

Choose a reason for hiding this comment

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

Remove this comment?

Copy link
Member Author

Choose a reason for hiding this comment

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

Done.

@Random-Liu
Copy link
Member

LGTM with one nit

@yujuhong
Copy link
Member Author

Thanks a lot for the review!

@ixdy
Copy link
Member

ixdy commented Jan 20, 2018

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

Associated issue requirement bypassed by: yujuhong

The full list of commands accepted by this bot can be found here.

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-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 20, 2018
@yujuhong yujuhong added the lgtm Indicates that a PR is ready to be merged. label Jan 20, 2018
@yujuhong
Copy link
Member Author

Applied lgtm based on #58548 (comment)

@k8s-github-robot
Copy link
Contributor

/test all [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link
Contributor

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit bfac95e into kubernetes:master Jan 20, 2018
@yujuhong yujuhong deleted the simplify-ds branch January 26, 2018 18:50
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

@ixdy ixdy

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 Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@yujuhong @k8s-ci-robot @Random-Liu @ixdy @k8s-github-robot @shlevy