Fix containerd config_path error when containerd_registries is configed #9770

lengrongfu · 2023-02-09T05:35:48Z

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 · 2023-02-09T05:35:57Z

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.

roles/container-engine/containerd/defaults/main.yml

roles/container-engine/containerd/tasks/main.yml

roles/container-engine/containerd/templates/config.toml.j2

yankay · 2023-02-09T05:43:09Z

/ok-to-test

floryut · 2023-02-09T15:20:28Z

/hold pending ci fix

cristicalin · 2023-02-09T17:07:44Z

/retest

oomichi

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

k8s-ci-robot · 2023-02-17T01:47:20Z

[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:

~~OWNERS~~ [oomichi]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Signed-off-by: rongfu.leng <rongfu.leng@daocloud.io>

oomichi · 2023-02-17T03:06:10Z

Thanks for updating again ! :-)

/lgtm

…ed (kubernetes-sigs#9770) Signed-off-by: rongfu.leng <rongfu.leng@daocloud.io>

…ed (#9770) (#10665) Signed-off-by: rongfu.leng <rongfu.leng@daocloud.io> Co-authored-by: rongfu.leng <rongfu.leng@daocloud.io>

…ed (kubernetes-sigs#9770) Signed-off-by: rongfu.leng <rongfu.leng@daocloud.io>

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 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

k8s-ci-robot requested review from liupeng0518 and mzaian February 9, 2023 05:36

yankay requested changes Feb 9, 2023

View reviewed changes

roles/container-engine/containerd/defaults/main.yml Outdated Show resolved Hide resolved

roles/container-engine/containerd/tasks/main.yml Outdated Show resolved Hide resolved

roles/container-engine/containerd/templates/config.toml.j2 Outdated Show resolved Hide resolved

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

lengrongfu force-pushed the master branch from 6c0140d to 88782d3 Compare February 9, 2023 08:56

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 closed this Feb 9, 2023

floryut reopened this Feb 9, 2023

cristicalin closed this Feb 9, 2023