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

fix: with_item to with_dict #9729

Merged
merged 1 commit into from
Jan 31, 2023
Merged

fix: with_item to with_dict #9729

merged 1 commit into from
Jan 31, 2023

Conversation

lengrongfu
Copy link
Contributor

@lengrongfu lengrongfu commented Jan 29, 2023 •
edited by floryut
Loading

/kind bug

What this PR does / why we need it:
fixes containerd config_path.

Which issue(s) this PR fixes:

Fixes # #9566

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

Fix `containerd_insecure_registries` => move `with_item` to `with_dict`

@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 Jan 29, 2023
@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jan 29, 2023
@k8s-ci-robot k8s-ci-robot requested a review from mzaian January 29, 2023 03:54
@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 the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jan 29, 2023
This was referenced Jan 29, 2023
Merged
Closed
@yankay
Copy link
Member

yankay commented Jan 29, 2023 •
edited
Loading

/ok-to-test

Thanks @lengrongfu

  1. Should we add a test case for the config at "https://github.com/kubernetes-sigs/kubespray/tree/master/tests/files" .
  2. The config is a little complex, so it's welcome to append the docs to the https://github.com/kubernetes-sigs/kubespray/blob/master/docs/containerd.md .
  3. From the https://github.com/kubernetes-sigs/kubespray/blob/master/roles/kubespray-defaults/defaults/main.yaml#L363, it's a list, not dict. So we need to change it together.

I guess it is not a broken change, because of the #8340

@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 Jan 29, 2023
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 29, 2023
@lengrongfu lengrongfu force-pushed the master branch 4 times, most recently from 5fb860a to 940e995 Compare January 29, 2023 15:40
@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 Jan 29, 2023
@splix
Copy link

splix commented Jan 30, 2023

Having the same issue. Replacing to with_dict in lines 120 and 134 of the roles/container-engine/containerd/tasks/main.yml fixes it

@0ekk 0ekk mentioned this pull request Jan 30, 2023
Closed
@lengrongfu
Copy link
Contributor Author

Having the same issue. Replacing to with_dict in lines 120 and 134 of the roles/container-engine/containerd/tasks/main.yml fixes it

Yes，this PR is to fix this problem.

yankay
yankay requested changes Jan 30, 2023
View reviewed changes
.gitlab-ci/packet.yml Outdated Show resolved Hide resolved
tests/files/packet_ubuntu22-containerd.yml Outdated Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 30, 2023
@yankay
Copy link
Member

yankay commented Jan 30, 2023

/lgtm

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 30, 2023
@lengrongfu lengrongfu force-pushed the master branch 2 times, most recently from 0818be1 to d12bb55 Compare January 30, 2023 10:02
@teriyakichild teriyakichild mentioned this pull request Jan 31, 2023
Closed
@teriyakichild
Copy link

It probably makes sense to update the docs here to use the dictionary format: https://github.com/kubernetes-sigs/kubespray/blob/master/docs/offline-environment.md#configure-inventory

@yankay
Copy link
Member

yankay commented Jan 31, 2023

Thanks @lengrongfu

Hi @oomichi @liupeng0518 , would you please review it? There seems some issue needs to be solved by the PR.
/approve

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 31, 2023
@floryut
Copy link
Member

floryut commented Jan 31, 2023

/hold
Agree with @teriyakichild

@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 Jan 31, 2023
@lengrongfu
fix: with_item to with_dict
2038aa8 
Signed-off-by: rongfu.leng <rongfu.leng@daocloud.io>
@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 Jan 31, 2023
floryut
floryut approved these changes Jan 31, 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.

/unhold
/lgtm
Thank you @lengrongfu

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 31, 2023
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 31, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: floryut, lengrongfu, yankay

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 merged commit 0707c8e into kubernetes-sigs:master Jan 31, 2023
This was referenced Feb 1, 2023
Closed
Closed
@1eedaegon 1eedaegon mentioned this pull request Feb 1, 2023
Closed
floryut pushed a commit to floryut/kubespray that referenced this pull request Feb 2, 2023
@lengrongfu @floryut
fix: with_item to with_dict (kubernetes-sigs#9729)
7097a60 
Signed-off-by: rongfu.leng <rongfu.leng@daocloud.io>
@floryut floryut mentioned this pull request Feb 2, 2023
Merged
k8s-ci-robot pushed a commit that referenced this pull request Feb 2, 2023
@floryut @lengrongfu
fix: with_item to with_dict (#9729) (#9751)
0634be4 
Signed-off-by: rongfu.leng <rongfu.leng@daocloud.io>
Co-authored-by: rongfu.leng <rongfu.leng@daocloud.io>
HoKim98 pushed a commit to ulagbulag/kubespray that referenced this pull request Mar 8, 2023
@lengrongfu @HoKim98
fix: with_item to with_dict (kubernetes-sigs#9729)
6d9d099 
Signed-off-by: rongfu.leng <rongfu.leng@daocloud.io>
nolimitkun pushed a commit to nolimitkun/kubespray that referenced this pull request Mar 19, 2023
@lengrongfu @nolimitkun
fix: with_item to with_dict (kubernetes-sigs#9729)
9518eb7 
Signed-off-by: rongfu.leng <rongfu.leng@daocloud.io>
@yankay yankay mentioned this pull request May 15, 2023
Closed
pedro-peter pushed a commit to pedro-peter/kubespray that referenced this pull request May 8, 2024
@lengrongfu @pedromcpedro
fix: with_item to with_dict (kubernetes-sigs#9729)
5a2e534 
Signed-off-by: rongfu.leng <rongfu.leng@daocloud.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yankay yankay yankay requested changes

@floryut floryut floryut approved these changes

@cristicalin cristicalin Awaiting requested review from cristicalin

@mzaian mzaian Awaiting requested review from mzaian

Assignees

@yankay yankay

@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. 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@lengrongfu @k8s-ci-robot @yankay @splix @teriyakichild @floryut