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

cm: Remove legacy docker references #108007

Merged
merged 1 commit into from
Feb 10, 2022
Merged

cm: Remove legacy docker references #108007

merged 1 commit into from
Feb 10, 2022

Conversation

endocrimes
Copy link
Member

What type of PR is this?

/kind cleanup
/sig node

(because containermanager)
/cc @klueska

What this PR does / why we need it:

Dockershim and built-in Docker support are gone. This removes some leftover references to them in the container manager.

Special notes for your reviewer:

Does this PR introduce a user-facing change?

NONE

@k8s-ci-robot k8s-ci-robot 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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. sig/node Categorizes an issue or PR as relevant to SIG Node. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. area/kubelet labels Feb 8, 2022
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 8, 2022
@endocrimes
cm: Remove legacy docker references
c198062 
Dockershim and built-in Docker support are gone. Cleans up dead code
references to them.
@endocrimes
Copy link
Member Author

/test pull-kubernetes-unit

@mrunalp
Copy link
Contributor

mrunalp commented Feb 8, 2022

/lgtm

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

/triage accepted
/priority important-soon
(because deadcode bad)

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Feb 8, 2022
@endocrimes endocrimes added this to Needs Approver in SIG Node PR Triage Feb 8, 2022
adisky
adisky reviewed Feb 9, 2022
View reviewed changes
Copy link
Contributor

@adisky adisky left a comment •
edited

Choose a reason for hiding this comment

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

This is being already taken care by this PR, waiting approval https://github.com/kubernetes/kubernetes/pull/107594/files#diff-c07d343a8d459721656cf7ddacda71506bde01a5cac288d15a4aba6bfc9a1cae

@endocrimes endocrimes mentioned this pull request Feb 9, 2022
Closed
ehashman
ehashman reviewed Feb 9, 2022
View reviewed changes
Copy link
Member

@ehashman ehashman left a comment

Choose a reason for hiding this comment

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

/lgtm

pkg/kubelet/cm/container_manager_linux.go
// Temporarily export the function to be used by dockershim.
// TODO(yujuhong): Move this function to dockershim once kubelet migrates to
// dockershim as the default.
func EnsureDockerInContainer(dockerAPIVersion *utilversion.Version, oomScoreAdj int, manager cgroups.Manager) error {
Copy link
Member

Choose a reason for hiding this comment

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

This appears to be totally unused, surprised a linter didn't catch this. https://cs.k8s.io/?q=EnsureDockerInContainer&i=nope&files=&excludeFiles=&repos=kubernetes/kubernetes

Copy link
Member Author

Choose a reason for hiding this comment

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

Linters sadly seem to not catch public fns, in case they're being used across packages. But yeah couldn't find any real uses on all of github

@ehashman
Copy link
Member

ehashman commented Feb 9, 2022

This is being already taken care by this PR, waiting approval https://github.com/kubernetes/kubernetes/pull/107594/files#diff-c07d343a8d459721656cf7ddacda71506bde01a5cac288d15a4aba6bfc9a1cae

@adisky the author can rebase; these changes aren't related to the ones happening in that PR, and they probably shouldn't have mixed cleanups like that as it makes things more difficult to review.

@ehashman
Copy link
Member

ehashman commented Feb 9, 2022

/approve

let's see if that kicks the bot

@mrunalp
Copy link
Contributor

mrunalp commented Feb 9, 2022

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ehashman, endocrimes, mrunalp

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 Feb 9, 2022
@adisky
Copy link
Contributor

adisky commented Feb 10, 2022 •
edited

/hold
The PR #107594 is open from 3 weeks and also reviewed by @endocrimes , if mixing cleanups is a concern it should be given as review comment in that PR
cc @hakman @dims

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 10, 2022
@endocrimes
Copy link
Member Author

Fwiw I don't mind whether this merges and that PR gets a rebase, or that merges and I'll close this. (I had dropped context of that PR from my brain, so was cleaning stuff up as I went, sorry @hakman)

We mostly wanna get dockershim code out before 1.24 drops.

@hakman
Copy link
Member

hakman commented Feb 10, 2022

@endocrimes I don't mind rebasing that one either. Leaving the decision to you.

@adisky
Copy link
Contributor

adisky commented Feb 10, 2022

its upto you two @hakman @endocrimes, feel free to unhold as you like :)

@endocrimes
Copy link
Member Author

Cool - Gonna unhold (it'll simplify my life a lot as I work on unit testing CM, because this code is noise.) - But @hakman now I've seen your PR is also approved, rebase and I'll lgtm/unhold it for you when the timer expires tomorrow.

/unhold

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 10, 2022
@endocrimes
Copy link
Member Author

/test pull-kubernetes-e2e-kind-ipv6

@k8s-ci-robot k8s-ci-robot merged commit 3b4a9cd into kubernetes:master Feb 10, 2022
SIG Node PR Triage automation moved this from Needs Approver to Done Feb 10, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.24 milestone Feb 10, 2022
@endocrimes endocrimes deleted the dani/cm-remove-docker branch February 10, 2022 11:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ehashman ehashman ehashman left review comments

@adisky adisky adisky left review comments

@klueska klueska Awaiting requested review from klueska

Assignees

@mrunalp mrunalp

@ehashman ehashman

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/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. 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/L Denotes a PR that changes 100-499 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
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
6 participants
@endocrimes @mrunalp @ehashman @k8s-ci-robot @adisky @hakman