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.

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

Fix containerd config_path error when containerd_registries is configed #9770

Merged
merged 1 commit into from
Feb 17, 2023

Conversation

lengrongfu
Copy link
Contributor

@lengrongfu lengrongfu commented Feb 9, 2023

What type of PR is this?
/kind bug

What this PR does / why we need it:
Fix containerd config_path error when containerd_registries is configed.

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

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 the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Feb 9, 2023
@k8s-ci-robot
Copy link
Contributor

Hi @lengrongfu. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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 needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 9, 2023
@yankay
Copy link
Member

yankay commented Feb 9, 2023

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Feb 9, 2023
@floryut
Copy link
Member

floryut commented Feb 9, 2023

/hold pending ci fix

@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 9, 2023
@floryut floryut closed this Feb 9, 2023
@floryut floryut reopened this Feb 9, 2023
@cristicalin
Copy link
Contributor

/retest

@cristicalin cristicalin closed this Feb 9, 2023
@cristicalin cristicalin reopened this Feb 9, 2023
@cristicalin cristicalin closed this Feb 9, 2023
@cristicalin cristicalin reopened this Feb 9, 2023
@cristicalin cristicalin closed this Feb 9, 2023
@cristicalin cristicalin reopened this Feb 9, 2023
@cristicalin cristicalin closed this Feb 9, 2023
@cristicalin cristicalin reopened this Feb 9, 2023
@cristicalin cristicalin closed this Feb 9, 2023
@cristicalin cristicalin reopened this Feb 9, 2023
@cristicalin cristicalin closed this Feb 9, 2023
@cristicalin cristicalin reopened this Feb 9, 2023
@cristicalin cristicalin closed this Feb 9, 2023
@cristicalin cristicalin reopened this Feb 9, 2023
Copy link
Contributor

@oomichi oomichi left a comment

Choose a reason for hiding this comment

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

Thanks for fixing the issue.
Just one suggetion for cleanup.

but it is not matter, and the change seems good for me.

/approve

roles/container-engine/containerd/tasks/main.yml Outdated Show resolved Hide resolved
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lengrongfu, oomichi

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 17, 2023
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 17, 2023
Signed-off-by: rongfu.leng <rongfu.leng@daocloud.io>
@oomichi
Copy link
Contributor

oomichi commented Feb 17, 2023

Thanks for updating again ! :-)

/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 17, 2023
@k8s-ci-robot k8s-ci-robot merged commit 145c80e into kubernetes-sigs:master Feb 17, 2023
@floryut floryut added the kind/feature Categorizes issue or PR as related to a new feature. label Feb 20, 2023
HoKim98 pushed a commit to ulagbulag/kubespray that referenced this pull request Mar 8, 2023
HoKim98 pushed a commit to ulagbulag/kubespray that referenced this pull request Mar 8, 2023
nolimitkun pushed a commit to nolimitkun/kubespray that referenced this pull request Mar 19, 2023
xinnj added a commit to xinnj/kubespray that referenced this pull request Mar 28, 2023
zocimek pushed a commit to zocimek/kubespray that referenced this pull request Apr 1, 2023
Jeroen0494 pushed a commit to Jeroen0494/kubespray that referenced this pull request May 9, 2023
@yankay yankay mentioned this pull request May 15, 2023
ErikJiang pushed a commit to ErikJiang/kubespray that referenced this pull request Nov 29, 2023
ErikJiang pushed a commit to ErikJiang/kubespray that referenced this pull request Dec 1, 2023
k8s-ci-robot pushed a commit that referenced this pull request Dec 5, 2023
…ed (#9770) (#10665)

Signed-off-by: rongfu.leng <rongfu.leng@daocloud.io>
Co-authored-by: rongfu.leng <rongfu.leng@daocloud.io>
pedro-peter pushed a commit to pedro-peter/kubespray that referenced this pull request May 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants