-
Notifications
You must be signed in to change notification settings - Fork 2.3k
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 support for containerd cri registry config_path #8973
Merged
brandond
merged 1 commit into
k3s-io:master
from
brandond:containerd_registry_config_path
Jan 5, 2024
Merged
Add support for containerd cri registry config_path #8973
brandond
merged 1 commit into
k3s-io:master
from
brandond:containerd_registry_config_path
Jan 5, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
brandond
force-pushed
the
containerd_registry_config_path
branch
from
November 30, 2023 09:48
2d2542a
to
0111fee
Compare
brandond
force-pushed
the
containerd_registry_config_path
branch
from
November 30, 2023 21:01
0111fee
to
fe17b70
Compare
brandond
force-pushed
the
containerd_registry_config_path
branch
2 times, most recently
from
November 30, 2023 21:59
c2c648b
to
78975ca
Compare
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## master #8973 +/- ##
==========================================
- Coverage 41.56% 41.43% -0.13%
==========================================
Files 148 150 +2
Lines 15946 16024 +78
==========================================
+ Hits 6628 6640 +12
- Misses 8189 8250 +61
- Partials 1129 1134 +5
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
11 tasks
brandond
force-pushed
the
containerd_registry_config_path
branch
from
December 8, 2023 23:03
78975ca
to
7645c87
Compare
brandond
force-pushed
the
containerd_registry_config_path
branch
from
December 23, 2023 00:48
7645c87
to
fb0dde0
Compare
dereknola
approved these changes
Jan 2, 2024
brandond
force-pushed
the
containerd_registry_config_path
branch
from
January 4, 2024 00:09
fb0dde0
to
a9d664b
Compare
Render cri registry mirrors.x.endpoints and configs.x.tls into config_path; keep using mirrors.x.rewrites and configs.x.auth those do not yet have an equivalent in the new format. The new config file format allows disabling containerd's fallback to the default endpoint when using mirror endpoints; a new CLI flag is added to control that behavior. This also re-shares some code that was unnecessarily split into parallel implementations for linux/windows versions. There is probably more work to be done on this front but it's a good start. Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond
force-pushed
the
containerd_registry_config_path
branch
from
January 4, 2024 22:14
a9d664b
to
f4f7850
Compare
vitorsavian
approved these changes
Jan 5, 2024
This was referenced Jan 10, 2024
This was referenced Apr 18, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed Changes
Add support for containerd cri registry config_path
Render cri registry mirrors.x.endpoints and configs.x.tls into config_path; keep
using mirrors.x.rewrites and configs.x.auth those do not yet have an
equivalent in the new format.
The new config file format allows disabling containerd's fallback to the
default endpoint when using mirror endpoints; a new CLI flag is added to
control that behavior.
This also re-shares some code that was unnecessarily split into parallel
implementations for linux/windows versions. There is probably more work
to be done on this front but it's a good start.
k3s-io/containerd@f4e0ac9
Bump containerd/runc to v1.7.10-k3s1/v1.1.10 #8962
Types of Changes
deprecated functionality
Verification
Confirm that registry mirrors, auth, and tls still work
Testing
Linked Issues
config_path
: On-the-fly container registry configuration #5568User-Facing Change
Further Comments