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

hollow-node use remote CRI #85879

Merged
merged 3 commits into from Dec 18, 2019
Merged

hollow-node use remote CRI #85879

merged 3 commits into from Dec 18, 2019

Conversation

gongguan
Copy link
Contributor

@gongguan gongguan commented Dec 4, 2019 •
edited

What type of PR is this?
/kind feature

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #41504

Special notes for your reviewer:
hollow-node use remote CRI rather than fakeDockerClient
Does this PR introduce a user-facing change?:

hollow-node use fake CRI

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/feature Categorizes issue or PR as related to a new feature. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Dec 4, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @gongguan. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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 needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. area/kubelet sig/node Categorizes an issue or PR as relevant to SIG Node. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Dec 4, 2019
@gongguan
Copy link
Contributor Author

gongguan commented Dec 4, 2019 •
edited

/assign @wojtek-t
/sig scalability

@k8s-ci-robot k8s-ci-robot added the sig/scalability Categorizes an issue or PR as relevant to SIG Scalability. label Dec 4, 2019
@RA489
Copy link

RA489 commented Dec 4, 2019

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Dec 4, 2019
wojtek-t
wojtek-t reviewed Dec 4, 2019
View reviewed changes
pkg/kubelet/kubelet.go Outdated Show resolved Hide resolved
@wojtek-t
Copy link
Member

wojtek-t commented Dec 6, 2019

/assign @tallclair @yujuhong @derekwaynecarr
Can one of you please take a look at Kubelet part? It looks good to me after the changes, but I would like to get your opinion too.

@gongguan
Copy link
Contributor Author

gongguan commented Dec 6, 2019

leave these because I'm not sure whether these should be removed now or later.
https://github.com/kubernetes/kubernetes/blob/master/pkg/kubelet/dockershim/docker_service.go#L168-L170

@gongguan
Copy link
Contributor Author

gongguan commented Dec 17, 2019 •
edited

@gongguan the only solution I can see is making StatsProvider a kubelet dependency. I'm not sure how much more refactoring that would require though...

Will the legacy function be dropped someday? In that case, I think it can be left as it was.

@dashpole
Copy link
Contributor

It will be dropped eventually, but i'm not sure how soon

@gongguan
Copy link
Contributor Author

gongguan commented Dec 17, 2019 •
edited

@gongguan the only solution I can see is making StatsProvider a kubelet dependency. I'm not sure how much more refactoring that would require though...

make a useLegacyCadvisorStats flag in kubelet dependency and remove remoteRuntimeEndpoint from NewMainKubelet.

@wojtek-t
Copy link
Member

LGTM, but I will let @dashpole to stamp it if he's fine with it.

@dashpole
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 17, 2019
@wojtek-t
Copy link
Member

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gongguan, wojtek-t

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

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel 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 Dec 17, 2019
@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 18, 2019
gongguan
gongguan commented Dec 18, 2019
View reviewed changes
pkg/kubelet/kubelet.go
klet.runtimeService = runtimeService
klet.dockerLegacyService = kubeDeps.dockerLegacyService
klet.criHandler = kubeDeps.criHandler
klet.runtimeService = kubeDeps.RemoteRuntimeService
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry for omitting this sentence, fix tests by only adding it @wojtek-t @dashpole .
By the way, I wonder why tests passed before.

@wojtek-t
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 18, 2019
@gongguan
Copy link
Contributor Author

gongguan commented Dec 18, 2019 •
edited

/priority important-longterm

@k8s-ci-robot k8s-ci-robot added priority/important-longterm Important over the long term, but may not be staffed and/or may need multiple releases to complete. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Dec 18, 2019
@gongguan
Copy link
Contributor Author

/retest

@k8s-ci-robot k8s-ci-robot merged commit 814fc34 into kubernetes:master Dec 18, 2019
@k8s-ci-robot k8s-ci-robot added this to the v1.18 milestone Dec 18, 2019
@gongguan gongguan deleted the cri-kubemark branch December 18, 2019 14:05
jkaniuk added a commit to jkaniuk/kubernetes that referenced this pull request Dec 19, 2019
@jkaniuk
Revert pull request kubernetes#85879 "hollow-node use remote CRI"
4303be3
This was referenced Dec 19, 2019
Closed
Closed
k8s-ci-robot added a commit that referenced this pull request Dec 19, 2019
@k8s-ci-robot
Merge pull request #86425 from jkaniuk/revert-85879
9f841bf 
Revert pull request #85879 "hollow-node use remote CRI"
@gongguan gongguan mentioned this pull request Dec 24, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dashpole dashpole dashpole left review comments

@wojtek-t wojtek-t wojtek-t left review comments

@gmarek gmarek Awaiting requested review from gmarek

Assignees

@dashpole dashpole

@derekwaynecarr derekwaynecarr

@yujuhong yujuhong

@wojtek-t wojtek-t

@tallclair tallclair

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubelet cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. priority/important-longterm Important over the long term, but may not be staffed and/or may need multiple releases to complete. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/scalability Categorizes an issue or PR as relevant to SIG Scalability. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.18
Development

Successfully merging this pull request may close these issues.

kubemark should replace the fake docker client with a fake CRI client
9 participants
@gongguan @k8s-ci-robot @RA489 @wojtek-t @dashpole @fejta-bot @derekwaynecarr @yujuhong @tallclair