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

fix: registry mirror fallback handling #9723

Merged
merged 1 commit into from
Nov 14, 2024

Conversation

smira
Copy link
Member

@smira smira commented Nov 14, 2024

Fixes #9613

This has two changes:

  • adjust Talos registry resolver to match containerd (CRI) resolver: use by default upstream as a fallback
  • add a machine config option to skip upstream as a fallback, and adjust CRI configuration accordingly

See https://github.com/containerd/containerd/blob/main/docs/hosts.md#registry-configuration---examples for details on CRI's hosts.toml.

@smira smira added this to the v1.9 milestone Nov 14, 2024
internal/pkg/containers/image/resolver.go Outdated Show resolved Hide resolved
@smira smira force-pushed the fix/mirrors-fallback branch from bb0ad93 to fb727c2 Compare November 14, 2024 15:12
Fixes siderolabs#9613

This has two changes:

* adjust Talos registry resolver to match containerd (CRI) resolver: use
  by default upstream as a fallback
* add a machine config option to skip upstream as a fallback, and adjust
  CRI configuration accordingly

See https://github.com/containerd/containerd/blob/main/docs/hosts.md#registry-configuration---examples
for details on CRI's `hosts.toml`.

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
@smira smira force-pushed the fix/mirrors-fallback branch from fb727c2 to 30f8b5a Compare November 14, 2024 16:38
@smira
Copy link
Member Author

smira commented Nov 14, 2024

/m

@talos-bot talos-bot merged commit 30f8b5a into siderolabs:main Nov 14, 2024
50 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

adjust Talos resolver to use upstream as a fallback
4 participants