-
Notifications
You must be signed in to change notification settings - Fork 6.6k
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_extra_args #7461
Conversation
Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). 📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA. It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.
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. I understand the commands that are listed here. |
Welcome @azuwis! |
Hi @azuwis. 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 Once the patch is verified, the new status will be reflected by the 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. |
I signed it |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/cc @oomichi
@@ -39,3 +39,7 @@ version = 2 | |||
[plugins."io.containerd.grpc.v1.cri".registry.mirrors."{{ registry }}"] | |||
endpoint = ["{{ ([ addr ] | flatten ) | join('","') }}"] | |||
{% endfor %} | |||
|
|||
{% if 'extra' in containerd_config %} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
container_config is deprecated as
kubespray/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml
Lines 311 to 317 in bef1e62
- name: Stop if using deprecated containerd_config variable | |
assert: | |
that: containerd_config is not defined | |
msg: "Variable containerd_config is now deprecated. See https://github.com/kubernetes-sigs/kubespray/blob/master/inventory/sample/group_vars/all/containerd.yml for details." | |
when: | |
- containerd_config is defined | |
- not ignore_assert_errors |
It is necessary to add containerd_extra_args or something instead.
Renamed to |
There are weave_extra_args, kube_router_extra_args, ingress_nginx_extra_args. |
One more thing: Please add the default value into roles/container-engine/containerd/defaults/main.yml |
This is useful for custom containerd config, e.g. auth Signed-off-by: Zhong Jianxin <azuwis@gmail.com>
It may contain sensitive information like password Signed-off-by: Zhong Jianxin <azuwis@gmail.com>
Renamed to |
Thanks for updating. /ok-to-test |
/retitle Add containerd_extra_args |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: azuwis, 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 |
* Add containerd_extra_args This is useful for custom containerd config, e.g. auth Signed-off-by: Zhong Jianxin <azuwis@gmail.com> * Make containerd config.toml mode 0640 It may contain sensitive information like password Signed-off-by: Zhong Jianxin <azuwis@gmail.com>
* Add containerd_extra_args This is useful for custom containerd config, e.g. auth Signed-off-by: Zhong Jianxin <azuwis@gmail.com> * Make containerd config.toml mode 0640 It may contain sensitive information like password Signed-off-by: Zhong Jianxin <azuwis@gmail.com>
What type of PR is this?
/kind feature
What this PR does / why we need it:
This is useful for custom containerd config, e.g. auth
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Does this PR introduce a user-facing change?: