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

add containerd config_path #9566

Merged
merged 1 commit into from
Jan 17, 2023
Merged

Conversation

lengrongfu
Copy link
Contributor

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

What type of PR is this?

/kind feature

What this PR does / why we need it:
Because [plugins."io.containerd.grpc.v1.cri".registry.configs."{{ addr }}".tls] config whell DEPRECATE.

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

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

In containerd config.toml.j2 file add config_path var.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Dec 13, 2022
@k8s-ci-robot
Copy link
Contributor

Welcome @lengrongfu!

It looks like this is your first PR to kubernetes-sigs/kubespray 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/kubespray has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@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/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 13, 2022
@yankay
Copy link
Member

yankay commented Dec 14, 2022

/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 Dec 14, 2022
@liupeng0518
Copy link
Member

/lgtm

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

oomichi commented Dec 19, 2022

molecule_containerd was failed.
Let me kick the job again.

    ______________________ test_version[ansible://almalinux8] ______________________
    
    host = <testinfra.host.Host ansible://almalinux8>
    
        def test_version(host):
            crictl = "/usr/local/bin/crictl"
            path = "unix:///var/run/containerd/containerd.sock"
            with host.sudo():
                cmd = host.command(crictl + " --runtime-endpoint " + path + " version")
    >       assert cmd.rc == 0
    E       assert 1 == 0
    E        +  where 1 = CommandResult(command=b"sudo /bin/sh -c '/usr/local/bin/crictl --runtime-endpoint unix:///var/run/containerd/container...etting the runtime version: rpc error: code = Unimplemented desc = unknown service runtime.v1alpha2.RuntimeService"\n').rc
    
    tests/test_default.py:21: AssertionError

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 11, 2023
@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 12, 2023
@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 12, 2023
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 13, 2023
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 14, 2023
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 16, 2023
@lengrongfu
Copy link
Contributor Author

@oomichi @liupeng0518 PTAL

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 updating.
just one comment for less code.

roles/container-engine/containerd/tasks/main.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 17, 2023
Signed-off-by: rongfu.leng <rongfu.leng@daocloud.io>
@oomichi
Copy link
Contributor

oomichi commented Jan 17, 2023

Thanks for updating.

/lgtm

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

Thanks @lengrongfu for this work!

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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 Jan 17, 2023
@k8s-ci-robot k8s-ci-robot merged commit 8a03bb1 into kubernetes-sigs:master Jan 17, 2023
@floryut floryut mentioned this pull request Jan 17, 2023
@liofko
Copy link

liofko commented Jan 23, 2023

Hi @lengrongfu
Thanks for this change.

While adding the following to a var file in our cluster group_vars:
containerd_insecure_registries:
"registry:8082": "http://registry:8082"

I'm getting the following error at
TASK [container-engine/containerd : containerd \uff5c Create registry directories] *********************************************************
fatal: [node1]: FAILED! => {"msg": "The task includes an option with an undefined variable. The error was: 'ansible.utils.unsafe_proxy.AnsibleUnsafeText object' has no attribute 'key'\n\nThe error appears to be in '/opt/muse/infra/setup/tools/kubespray/roles/container-engine/containerd/tasks/main.yml': line 114, column 3, but may\nbe elsewhere in the file depending on the exact syntax problem.\n\nThe offending line appears to be:\n\n\n- name: containerd \uff5c Create registry directories\n ^ here\n"}

Its seems to only working if I'm changing the 'with_items' into 'with_dict' in those tasks.

Am I missing something ? did I configured the vars wrongly ?

Thanks
liofko

enneitex pushed a commit to enneitex/kubespray that referenced this pull request Jan 25, 2023
Signed-off-by: rongfu.leng <rongfu.leng@daocloud.io>

Signed-off-by: rongfu.leng <rongfu.leng@daocloud.io>
@lengrongfu
Copy link
Contributor Author

@liofko There should be a problem here, I will fix it, thank you for your suggestion. #9729

HoKim98 pushed a commit to ulagbulag/kubespray that referenced this pull request Mar 8, 2023
Signed-off-by: rongfu.leng <rongfu.leng@daocloud.io>

Signed-off-by: rongfu.leng <rongfu.leng@daocloud.io>
nolimitkun pushed a commit to nolimitkun/kubespray that referenced this pull request Mar 19, 2023
Signed-off-by: rongfu.leng <rongfu.leng@daocloud.io>

Signed-off-by: rongfu.leng <rongfu.leng@daocloud.io>
pedro-peter pushed a commit to pedro-peter/kubespray that referenced this pull request May 8, 2024
Signed-off-by: rongfu.leng <rongfu.leng@daocloud.io>

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
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. 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/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants