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

check containerd as well as docker-containerd #97888

Merged
merged 1 commit into from Feb 10, 2021
Merged

check containerd as well as docker-containerd #97888

merged 1 commit into from Feb 10, 2021

Conversation

pacoxu
Copy link
Member

@pacoxu pacoxu commented Jan 10, 2021 •
edited

What type of PR is this?
/kind bug
/sig node

What this PR does / why we need it:

According to EndOfLife Docker Versions
As the old version docker is not supported. So use the current default behavior.

  • no containerd pid
  • user containerd as process name

Which issue(s) this PR fixes:
Fixes #97565

Special notes for your reviewer:
However, this may be removed later as docker-shim is deprecated.

Does this PR introduce a user-facing change?:

In the method that ensures that the docker and containerd are in the correct containers with the proper OOM score set up, fixed the bug of identifying containerd process.

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/bug Categorizes issue or PR as related to a bug. 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 Jan 10, 2021
@pacoxu pacoxu force-pushed the fix/97565 branch 2 times, most recently from d87b93a to dc1959b Compare January 10, 2021 13:52
@ehashman ehashman added this to Needs Reviewer in SIG Node PR Triage Jan 11, 2021
@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 23, 2021
@pacoxu
Copy link
Member Author

pacoxu commented Jan 23, 2021

Thanks @SergeyKanzhelev , Fixed.

According to https://success.mirantis.com/article/maintenance-lifecycle#endoflifeeoldockerengineversions
As the old version docker is not supported. Just change the processName here would be OK.

@SergeyKanzhelev SergeyKanzhelev mentioned this pull request Jan 23, 2021
Closed
@pacoxu
Copy link
Member Author

pacoxu commented Jan 23, 2021

@SergeyKanzhelev Thanks a lot. Appreciate your detailed research on backgrounds.
Updated the comments and the description of this PR.

@pacoxu
check containerd as process name instead of docker-containerd
89c42bd 
Signed-off-by: pacoxu <paco.xu@daocloud.io>
@ehashman
Copy link
Member

/triage accepted

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Jan 25, 2021
@SergeyKanzhelev
Copy link
Member

/lgtm

please update the release notes to something like this:

replace this:

docker PID detection needs to check process name containerd instead of docker-containerd.

with this:

In the method that ensures that the docker and containerd are in the correct containers with the proper OOM score set up, fixed the bug of identifying containerd process.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 25, 2021
@pacoxu
Copy link
Member Author

pacoxu commented Jan 25, 2021

@SergeyKanzhelev thanks. Updated

@ehashman ehashman moved this from Needs Reviewer to Needs Approver in SIG Node PR Triage Jan 26, 2021
@mrunalp
Copy link
Contributor

mrunalp commented Feb 9, 2021

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mrunalp, pacoxu

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, 2021
@mrunalp mrunalp moved this from Needs Approver to Done in SIG Node PR Triage Feb 9, 2021
@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.

1 similar comment
@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.

@pacoxu
Copy link
Member Author

pacoxu commented Feb 10, 2021

/retest

@pacoxu
Copy link
Member Author

pacoxu commented Feb 10, 2021

/retest
flake😓

@pacoxu
Copy link
Member Author

pacoxu commented Feb 10, 2021

/retest

@k8s-ci-robot k8s-ci-robot merged commit d819199 into kubernetes:master Feb 10, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.21 milestone Feb 10, 2021
@pacoxu pacoxu deleted the fix/97565 branch June 23, 2021 05:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bartosh bartosh bartosh left review comments

@dims dims dims left review comments

@krmayankk krmayankk Awaiting requested review from krmayankk

@vishh vishh Awaiting requested review from vishh

@SergeyKanzhelev SergeyKanzhelev Awaiting requested review from SergeyKanzhelev

Assignees

@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. 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. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
SIG Node PR Triage
Done
Milestone
v1.21
Development

Successfully merging this pull request may close these issues.

docker-containerd have renamed to containerd, but EnsureDockerInContainer check not update
8 participants
@pacoxu @ehashman @SergeyKanzhelev @mrunalp @k8s-ci-robot @fejta-bot @bartosh @dims