Skip to content

/ kubernetes

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

@yujuhong yujuhong commented Jan 19, 2018

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

@k8s-ci-robot k8s-ci-robot commented Jan 19, 2018

@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.
@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 force-pushed the yujuhong:simplify-ds branch from a6d0c19 to 2a189cc Jan 19, 2018
@yujuhong
Copy link
Member Author

@yujuhong yujuhong commented Jan 19, 2018

/approve no-issue
@yujuhong
Copy link
Member Author

@yujuhong yujuhong commented Jan 19, 2018

/test pull-kubernetes-node-e2e
@yujuhong yujuhong force-pushed the yujuhong:simplify-ds branch 2 times, most recently from 4fadb1e to adc2e94 Jan 19, 2018
@k8s-ci-robot k8s-ci-robot removed the approved label Jan 20, 2018
@yujuhong yujuhong force-pushed the yujuhong:simplify-ds branch from adc2e94 to adfc790 Jan 20, 2018
yujuhong added 3 commits Jan 19, 2018
@yujuhong
dockershim: remove the use of kubelet's internal API
Loading status checks…
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
Loading status checks…
2091028
@yujuhong
dockershim: call DockerService.Start() during grpc server startup
Loading status checks…
9728c56
@yujuhong yujuhong force-pushed the yujuhong:simplify-ds branch from adfc790 to 53f7a60 Jan 20, 2018
@yujuhong yujuhong assigned Random-Liu and unassigned yujuhong Jan 20, 2018
@yujuhong
Copy link
Member Author

@yujuhong yujuhong commented Jan 20, 2018

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 changes
pkg/kubelet/dockershim/docker_legacy_service.go Outdated
kuberuntime.LegacyLogProvider
}

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

This comment has been minimized.

Sign in to view
@Random-Liu

Random-Liu Jan 20, 2018
Member

Remove this comment?

This comment has been minimized.

Sign in to view
@yujuhong

yujuhong Jan 20, 2018
Author Member

Done.
@Random-Liu
Copy link
Member

@Random-Liu Random-Liu commented Jan 20, 2018

LGTM with one nit
@yujuhong
dockershim: clean up the legacy interface
Loading status checks…
0957afb
@yujuhong yujuhong force-pushed the yujuhong:simplify-ds branch from 53f7a60 to 0957afb Jan 20, 2018
@yujuhong
Copy link
Member Author

@yujuhong yujuhong commented Jan 20, 2018

Thanks a lot for the review!
@ixdy
Copy link
Member

@ixdy ixdy commented Jan 20, 2018

/approve
@k8s-ci-robot
Copy link
Contributor

@k8s-ci-robot k8s-ci-robot commented Jan 20, 2018

[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
@yujuhong yujuhong added the lgtm label Jan 20, 2018
@yujuhong
Copy link
Member Author

@yujuhong yujuhong commented Jan 20, 2018

Applied lgtm based on #58548 (comment)
@k8s-github-robot
Copy link
Contributor

@k8s-github-robot k8s-github-robot commented Jan 20, 2018

/test all [submit-queue is verifying that this PR is safe to merge]
@k8s-github-robot
Copy link
Contributor

@k8s-github-robot k8s-github-robot commented Jan 20, 2018

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
12 of 13 checks passed
12 of 13 checks passed
Submit Queue Required Github CI test is not green: pull-kubernetes-e2e-gce
Details
cla/linuxfoundation yujuhong authorized
Details
pull-kubernetes-bazel-build Job succeeded.
Details
pull-kubernetes-bazel-test Job succeeded.
Details
pull-kubernetes-cross Job succeeded.
Details
pull-kubernetes-e2e-gce Job succeeded.
Details
pull-kubernetes-e2e-gce-device-plugin-gpu Job succeeded.
Details
pull-kubernetes-e2e-gke-gci Skipped
pull-kubernetes-e2e-kops-aws Job succeeded.
Details
pull-kubernetes-kubemark-e2e-gce Job succeeded.
Details
pull-kubernetes-node-e2e Job succeeded.
Details
pull-kubernetes-unit Job succeeded.
Details
pull-kubernetes-verify Job succeeded.
Details
@yujuhong yujuhong deleted the yujuhong:simplify-ds branch Jan 26, 2018
@shlevy

This comment has been minimized.

Sign in to view
Copy link
Contributor

@shlevy shlevy commented on e8da890 Feb 7, 2018

@yujuhong Does this mean k8s is no longer using the CRI for docker?

This comment has been minimized.

Sign in to view
Copy link
Member Author

@yujuhong yujuhong replied Feb 7, 2018

No. It means the opposite. Kubelet has to go through CRI to talk to docker.

This comment has been minimized.

Sign in to view
Copy link
Contributor

@shlevy shlevy replied Feb 7, 2018

@yujuhong Ah, great! Where is the docker CRI implementation now?

This comment has been minimized.

Sign in to view
Copy link
Member Author

@yujuhong yujuhong replied Feb 7, 2018

It's still in the same location pkg/kubelet/dockershim. This PR removed the backdoor for using dockershim directly (without going through CRI w/ grpc)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Random-Liu Random-Liu

Assignees

@Random-Liu Random-Liu

@ixdy ixdy

Labels
approved cncf-cla: yes kind/cleanup lgtm release-note-none size/XXL
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

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