-
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
Replace use of Spegel fork with upstream #9365
base: master
Are you sure you want to change the base?
Conversation
d9dd67d
to
7b2bf60
Compare
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.
This is awesome, thank you!
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## master #9365 +/- ##
==========================================
- Coverage 49.42% 42.92% -6.51%
==========================================
Files 151 154 +3
Lines 13475 13533 +58
==========================================
- Hits 6660 5809 -851
- Misses 5474 6557 +1083
+ Partials 1341 1167 -174
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
LGTM, but it looks like there's a conflict. If you're up for a rebase, we're planning to go into code freeze for next week's releases on Monday. |
Signed-off-by: Philip Laine <[email protected]>
7b2bf60
to
2f577c8
Compare
@brandond missed the code freeze but i rebased now, and can rebase again later when it is possible to merge. Do you know when that will be possible? |
Code Freeze usually lasts about 2 weeks, so likely towards the end of February. |
@phillebaba FYI I might be looking into adding support for mirroring images from all registries, instead of a fixed list - see the thread at #9061 (comment) |
Proposed Changes
This replaces the k3s fork of Spegel with the upstream version. This change can be done as the changes done in the fork have been merged upstream.
Types of Changes
No changes introduced, just a replacement of dependency.
Verification
Rely on existing testing of Spegel integration in k3s.
Testing
Linked Issues
User-Facing Change
Further Comments
An easy way to check the change is to look at the diff between the k3s fork and upstream. The only changes are related to changes that have been done upstream.
https://github.com/XenitAB/spegel/compare/main..k3s-io:spegel:k3s-main