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

containerd_registries_mirrors is mandatory for containerd server #11553

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

sathieu
Copy link
Contributor

@sathieu sathieu commented Sep 19, 2024

What type of PR is this?

Uncomment only one /kind <> line, hit enter to put that in a new line, and remove leading whitespaces from that line:

/kind api-change
/kind bug
/kind cleanup
/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:


@k8s-ci-robot
Copy link
Contributor

Adding the "do-not-merge/release-note-label-needed" label because no release-note block was detected, please follow our release note process to remove it.

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-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Sep 19, 2024
@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/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Sep 19, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @sathieu. 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-sigs/prow repository.

Copy link
Member

@tico88612 tico88612 left a comment

Choose a reason for hiding this comment

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

I don't understand this PR change; I see that the template doesn't need to add this variable.

{% if containerd_use_config_path is defined and containerd_use_config_path|bool %}

@yankay
Copy link
Member

yankay commented Sep 20, 2024

/ok-to-test
Thanks @sathieu

More information may be added to the PR describtion :-)
/approve

@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 Sep 20, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sathieu, 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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 20, 2024
@tico88612
Copy link
Member

tico88612 commented Sep 20, 2024

Please edit your PR content.

/hold

@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 Sep 20, 2024
@sathieu
Copy link
Contributor Author

sathieu commented Sep 20, 2024

I don't understand this PR change; I see that the template doesn't need to add this variable.

{% if containerd_use_config_path is defined and containerd_use_config_path|bool %}

This is because when the path is not set, the server param is not applied.

This is not clearly documented, but I think this comes from here:

https://github.com/containerd/containerd/blob/v1.7.22/remotes/docker/config/hosts.go#L78-L90

The advanced options (use_path, server) are only available when config_path is used.

The server part is in the parseHostConfig function:

https://github.com/containerd/containerd/blob/v1.7.22/remotes/docker/config/hosts.go#L419

Which is called from parseHostsFile called from loadHostDir.

The legacy part is not setting server :

https://github.com/containerd/containerd/blob/v1.7.22/remotes/docker/config/hosts.go#L92-L269

@tico88612
Copy link
Member

It should be that containerd_registries_mirrors has been deprecated in Containerd, and it should be a matter of fixing the configuration file to the format that is currently supported by Containerd (the hosts are all written in /etc/containerd/certs.d).

@sathieu
Copy link
Contributor Author

sathieu commented Oct 1, 2024

@tico88612 the new format is already supported (and enabled with containerd_use_config_path: true). Maybe change the default to containerd_use_config_path: true? Or remove the option to set it to false...

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. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants