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

Replace use of Spegel fork with upstream #9365

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

Conversation

phillebaba
Copy link
Contributor

@phillebaba phillebaba commented Feb 6, 2024

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

@phillebaba phillebaba requested a review from a team as a code owner February 6, 2024 22:06
@phillebaba phillebaba changed the title Remove use of Spegel fork Replace use of Spegel fork with upstream Feb 6, 2024
Copy link
Member

@brandond brandond left a 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!

pkg/spegel/spegel.go Show resolved Hide resolved
pkg/spegel/spegel.go Show resolved Hide resolved
Copy link

codecov bot commented Feb 6, 2024

Codecov Report

Attention: 16 lines in your changes are missing coverage. Please review.

Comparison is base (de82584) 49.42% compared to head (2f577c8) 42.92%.

Files Patch % Lines
pkg/spegel/spegel.go 0.00% 11 Missing ⚠️
pkg/spegel/bootstrap.go 0.00% 5 Missing ⚠️
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     
Flag Coverage Δ
e2etests ?
inttests 39.49% <0.00%> (+0.03%) ⬆️
unittests 15.94% <0.00%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@brandond
Copy link
Member

brandond commented Feb 9, 2024

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]>
@phillebaba
Copy link
Contributor Author

@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?

@dereknola
Copy link
Member

Code Freeze usually lasts about 2 weeks, so likely towards the end of February.

@brandond
Copy link
Member

brandond commented Feb 19, 2024

@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)

@brandond brandond mentioned this pull request Feb 29, 2024
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.

3 participants