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

Clean up logic for deprecated flag --container-runtime in kubelet #107594

Merged
merged 1 commit into from Feb 11, 2022
Merged

Clean up logic for deprecated flag --container-runtime in kubelet #107594

merged 1 commit into from Feb 11, 2022

Conversation

hakman
Copy link
Member

@hakman hakman commented Jan 17, 2022 •
edited

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

As part of the removal of dockershim and deprecation of the --container-runtime flag, the logic behind it should also be removed from kubelet.

Which issue(s) this PR fixes:

Refs: #106893

Special notes for your reviewer:

Refs: #107094

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/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. size/XL Denotes a PR that changes 500-999 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. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Jan 17, 2022
@k8s-ci-robot k8s-ci-robot added area/e2e-test-framework Issues or PRs related to refactoring the kubernetes e2e test framework area/kubelet area/provider/gcp Issues or PRs related to gcp provider area/test sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/scalability Categorizes an issue or PR as relevant to SIG Scalability. sig/testing Categorizes an issue or PR as relevant to SIG Testing. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jan 17, 2022
@hakman
Copy link
Member Author

hakman commented Jan 17, 2022

/cc @adisky @dims @endocrimes

@hakman hakman force-pushed the remove_container-runtime_logic branch 6 times, most recently from b79d64b to 006e082 Compare January 17, 2022 12:09
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 18, 2022
@hakman hakman force-pushed the remove_container-runtime_logic branch from 006e082 to cde81be Compare January 18, 2022 18:55
@hakman
Copy link
Member Author

hakman commented Feb 9, 2022

@hakman can you rebase it?

Sure, done. Could we get someone to do the final review for this?

adisky
adisky reviewed Feb 9, 2022
View reviewed changes
Copy link
Contributor

@adisky adisky left a comment

Choose a reason for hiding this comment

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

/lgtm
/assign @dims @dchen1107 @derekwaynecarr
(for approval)

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

dims commented Feb 9, 2022

/approve
/hold

@hakman please give it a bit of time for sig-node approvers to peek (say end of the week?) and then remove hold

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Feb 9, 2022
@hakman
Copy link
Member Author

hakman commented Feb 9, 2022

Sure. Thanks @dims!

@adisky adisky mentioned this pull request Feb 10, 2022
Merged
@hakman
Clean up logic for deprecated flag --container-runtime in kubelet
0819451 
Signed-off-by: Ciprian Hacman <ciprian@hakman.dev>
@hakman hakman force-pushed the remove_container-runtime_logic branch from 81bccf6 to 0819451 Compare February 10, 2022 11:27
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 10, 2022
endocrimes
endocrimes approved these changes Feb 11, 2022
View reviewed changes
Copy link
Member

@endocrimes endocrimes left a comment

Choose a reason for hiding this comment

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

/lgtm

the timer has also now expired and this can be merged.
/unhold

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Feb 11, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dims, endocrimes, hakman, yanghesong

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

@hakman
Copy link
Member Author

hakman commented Feb 11, 2022

/retest

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Feb 11, 2022 •
edited

@hakman: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-kubernetes-node-crio-e2e 1abe9a114e648ec05337a405c306cdabdbb0605d link false /test pull-kubernetes-node-crio-e2e

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

@hakman
Copy link
Member Author

hakman commented Feb 11, 2022

/retest

@hakman
Copy link
Member Author

hakman commented Feb 11, 2022

/test pull-kubernetes-e2e-gce-100-performance

@k8s-ci-robot k8s-ci-robot merged commit 8580bbf into kubernetes:master Feb 11, 2022
SIG Node CI/Test Board automation moved this from PRs - Needs Approver to Done Feb 11, 2022
SIG Node PR Triage automation moved this from Needs Approver to Done Feb 11, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.24 milestone Feb 11, 2022
@hakman hakman deleted the remove_container-runtime_logic branch February 12, 2022 03:14
@pacoxu pacoxu mentioned this pull request Apr 7, 2022
Merged
@SataQiu SataQiu mentioned this pull request Jun 6, 2022
Closed
@yanghesong yanghesong mentioned this pull request Nov 8, 2022
Closed
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adisky adisky adisky left review comments

@endocrimes endocrimes endocrimes approved these changes

@yanghesong yanghesong yanghesong approved these changes

@bobbypage bobbypage Awaiting requested review from bobbypage

@dchen1107 dchen1107 Awaiting requested review from dchen1107

@dims dims Awaiting requested review from dims

Assignees

@dims dims

@mrunalp mrunalp

@endocrimes endocrimes

@shyamjvs shyamjvs

@Random-Liu Random-Liu

@derekwaynecarr derekwaynecarr

@adisky adisky

@dchen1107 dchen1107

@swatisehgal swatisehgal

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/e2e-test-framework Issues or PRs related to refactoring the kubernetes e2e test framework area/kubelet area/provider/gcp Issues or PRs related to gcp provider area/test 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/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/scalability Categorizes an issue or PR as relevant to SIG Scalability. sig/testing Categorizes an issue or PR as relevant to SIG Testing. 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 CI/Test Board
Done
SIG Node CI/Test Board
Archived in project
SIG Node PR Triage
Done
Milestone
v1.24
Development

Successfully merging this pull request may close these issues.

None yet