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

Pass instrumented runtime service to containerGC #108527

Merged
merged 1 commit into from
Mar 8, 2022
Merged

Pass instrumented runtime service to containerGC #108527

merged 1 commit into from
Mar 8, 2022

Conversation

ddebroy
Copy link
Member

@ddebroy ddebroy commented Mar 4, 2022 •
edited

What type of PR is this?

/kind bug

What this PR does / why we need it:

containerGC is not passed the instrumented runtime service that kubeRuntimeManager.runtimeService is initialized with. As a result, RemovePodSandbox and StopPodSandbox calls invoked by containerGC do not go through the instrumented service. This PR overrides the runtimeService and imageService parameters with their instrumented versions so that the instrumented versions are used in the rest of the function including passing to containerGC

Which issue(s) this PR fixes:

--

Special notes for your reviewer:

Does this PR introduce a user-facing change?

NONE

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

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/bug Categorizes issue or PR as related to a bug. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Mar 4, 2022
@k8s-ci-robot
Copy link
Contributor

@ddebroy: This issue is currently awaiting triage.

If a SIG or subproject determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

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 the needs-priority Indicates a PR lacks a `priority/foo` label and requires one. label Mar 4, 2022
@k8s-ci-robot k8s-ci-robot added area/kubelet sig/node Categorizes an issue or PR as relevant to SIG Node. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Mar 4, 2022
@ddebroy
Copy link
Member Author

ddebroy commented Mar 4, 2022

/assign @mrunalp

@ddebroy ddebroy changed the title Pass instrumented runtime service to containergc Pass instrumented runtime service to containerGC Mar 4, 2022
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 7, 2022
SergeyKanzhelev
SergeyKanzhelev reviewed Mar 7, 2022
View reviewed changes
pkg/kubelet/kuberuntime/kuberuntime_manager.go Outdated
@@ -269,7 +269,7 @@ func NewKubeGenericRuntimeManager(
imagePullQPS,
imagePullBurst)
kubeRuntimeManager.runner = lifecycle.NewHandlerRunner(httpClient, kubeRuntimeManager, kubeRuntimeManager)
kubeRuntimeManager.containerGC = newContainerGC(runtimeService, podStateProvider, kubeRuntimeManager)
Copy link
Member

Choose a reason for hiding this comment

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

better solution may be to do

runtimeService = newInstrumentedRuntimeService(runtimeService)

in the beginning of the method so any future types using it will get instrumented value as well

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 - for both runtimeService and imageService

@SergeyKanzhelev
Copy link
Member

lgtm, except I'd suggest to make code a bit more future proof by overriding the argument passed into the func

@ddebroy
Pass instrumented runtime service to containergc
023d6fb 
Signed-off-by: Deep Debroy <ddebroy@gmail.com>
SergeyKanzhelev
SergeyKanzhelev approved these changes Mar 8, 2022
View reviewed changes
Copy link
Member

@SergeyKanzhelev SergeyKanzhelev left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 8, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ddebroy, mrunalp, SergeyKanzhelev

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 merged commit 29ed12e into kubernetes:master Mar 8, 2022
SIG Node PR Triage automation moved this from Triage to Done Mar 8, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.24 milestone Mar 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mrunalp mrunalp mrunalp approved these changes

@SergeyKanzhelev SergeyKanzhelev SergeyKanzhelev approved these changes

@feiskyer feiskyer Awaiting requested review from feiskyer

Assignees

@mrunalp mrunalp

@SergeyKanzhelev SergeyKanzhelev

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/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
SIG Node PR Triage
Archived in project
SIG Node PR Triage
Done
Milestone
v1.24
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@ddebroy @k8s-ci-robot @SergeyKanzhelev @mrunalp