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

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 commented Dec 4, 2019

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

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Dec 4, 2019

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 requested review from gmarek and wojtek-t Dec 4, 2019
@gongguan gongguan force-pushed the gongguan:cri-kubemark branch from 687d5c5 to 6f077b0 Dec 4, 2019
@gongguan

This comment has been minimized.

Copy link
Contributor Author

gongguan commented Dec 4, 2019

/assign @wojtek-t
/sig scalability

@RA489

This comment has been minimized.

Copy link
Contributor

RA489 commented Dec 4, 2019

/ok-to-test

@gongguan gongguan force-pushed the gongguan:cri-kubemark branch from 6f077b0 to b469404 Dec 4, 2019
pkg/kubelet/kubelet.go Outdated Show resolved Hide resolved
@gongguan gongguan force-pushed the gongguan:cri-kubemark branch from b1c9202 to 0dd4680 Dec 6, 2019
@wojtek-t

This comment has been minimized.

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

This comment has been minimized.

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

@dashpole

This comment has been minimized.

Copy link
Contributor

dashpole commented Dec 17, 2019

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

@gongguan gongguan force-pushed the gongguan:cri-kubemark branch from f846b4b to 0dd4593 Dec 17, 2019
@gongguan

This comment has been minimized.

Copy link
Contributor Author

gongguan commented Dec 17, 2019

@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

This comment has been minimized.

Copy link
Member

wojtek-t commented Dec 17, 2019

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

@dashpole

This comment has been minimized.

Copy link
Contributor

dashpole commented Dec 17, 2019

/lgtm

@wojtek-t

This comment has been minimized.

Copy link
Member

wojtek-t commented Dec 17, 2019

/approve

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Dec 17, 2019

[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

@fejta-bot

This comment has been minimized.

Copy link

fejta-bot commented Dec 17, 2019

/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 label Dec 18, 2019
@gongguan gongguan force-pushed the gongguan:cri-kubemark branch from b63c2af to e8e1cc9 Dec 18, 2019
klet.runtimeService = runtimeService
klet.dockerLegacyService = kubeDeps.dockerLegacyService
klet.criHandler = kubeDeps.criHandler
klet.runtimeService = kubeDeps.RemoteRuntimeService

This comment has been minimized.

Copy link
@gongguan

gongguan Dec 18, 2019

Author Contributor

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

This comment has been minimized.

Copy link
Member

wojtek-t commented Dec 18, 2019

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm label Dec 18, 2019
@gongguan

This comment has been minimized.

Copy link
Contributor Author

gongguan commented Dec 18, 2019

/priority important-longterm

@gongguan

This comment has been minimized.

Copy link
Contributor Author

gongguan commented Dec 18, 2019

/retest

@k8s-ci-robot k8s-ci-robot merged commit 814fc34 into kubernetes:master Dec 18, 2019
14 of 15 checks passed
14 of 15 checks passed
tide Not mergeable. Retesting: pull-kubernetes-kubemark-e2e-gce-big
Details
cla/linuxfoundation gongguan authorized
Details
pull-kubernetes-bazel-build Job succeeded.
Details
pull-kubernetes-bazel-test Job succeeded.
Details
pull-kubernetes-dependencies Job succeeded.
Details
pull-kubernetes-e2e-gce Job succeeded.
Details
pull-kubernetes-e2e-gce-100-performance Job succeeded.
Details
pull-kubernetes-e2e-gce-device-plugin-gpu Job succeeded.
Details
pull-kubernetes-e2e-kind Job succeeded.
Details
pull-kubernetes-integration Job succeeded.
Details
pull-kubernetes-kubemark-e2e-gce-big Job succeeded.
Details
pull-kubernetes-node-e2e Job succeeded.
Details
pull-kubernetes-node-e2e-containerd Job succeeded.
Details
pull-kubernetes-typecheck Job succeeded.
Details
pull-kubernetes-verify Job succeeded.
Details
@k8s-ci-robot k8s-ci-robot added this to the v1.18 milestone Dec 18, 2019
@gongguan gongguan deleted the gongguan:cri-kubemark branch Dec 18, 2019
jkaniuk added a commit to jkaniuk/kubernetes that referenced this pull request Dec 19, 2019
k8s-ci-robot added a commit that referenced this pull request Dec 19, 2019
Revert pull request #85879 "hollow-node use remote CRI"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.