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

[2.21] fix containerd config_path error (#9770) #10665

Merged
merged 1 commit into from
Dec 5, 2023
Merged

[2.21] fix containerd config_path error (#9770) #10665

merged 1 commit into from
Dec 5, 2023
+26 −23

Conversation

ErikJiang
Copy link
Member

What type of PR is this?
/kind bug

What this PR does / why we need it:
This is a cherry-pick of #9770

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

containerd add `containerd_use_config_path` config field.

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 29, 2023
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 29, 2023
@ErikJiang ErikJiang mentioned this pull request Nov 29, 2023
Closed
@ErikJiang
Copy link
Member Author

@liupeng0518 @bozzo PTAL

floryut
floryut approved these changes Dec 5, 2023
View reviewed changes
Copy link
Member

@floryut floryut left a comment

Choose a reason for hiding this comment

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

/lgtm

@ErikJiang All good as cherry-pick

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ErikJiang, floryut

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 Dec 5, 2023
@floryut floryut added the kind/container-managers Containers section in the release note label Dec 5, 2023
@k8s-ci-robot k8s-ci-robot merged commit d6f688f into kubernetes-sigs:release-2.21 Dec 5, 2023
58 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@floryut floryut floryut approved these changes

@bozzo bozzo Awaiting requested review from bozzo

@liupeng0518 liupeng0518 Awaiting requested review from liupeng0518

Assignees

@floryut floryut

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. kind/container-managers Containers section in the release note lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ErikJiang @k8s-ci-robot @floryut @lengrongfu