[release-1.31] Backports for 2025-01 #11566
Merged
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
2025-01-backports_release-1.31
branch
2 times, most recently
from
829d322 to
66cbf27
Compare
dereknola
approved these changes
Jan 10, 2025
Signed-off-by: galal-hussein <[email protected]> Signed-off-by: Brad Davidson <[email protected]> (cherry picked from commit b474770) Signed-off-by: Brad Davidson <[email protected]>
Expose actual error, so that we can tell if the deployment is not found or not ready/available Signed-off-by: Brad Davidson <[email protected]> (cherry picked from commit 93e5483) Signed-off-by: Brad Davidson <[email protected]>
Avoid "snapshot save already in progress" flake when snapshot reconcile from previous save is still in progress. Signed-off-by: Brad Davidson <[email protected]> (cherry picked from commit 68fbd1a) Signed-off-by: Brad Davidson <[email protected]>
k3s-io#11501 Signed-off-by: muicoder <[email protected]> (cherry picked from commit 056cee8) Signed-off-by: Brad Davidson <[email protected]>
The servers package, and router.go in particular, had become quite large. Address this by moving some things out to separate packages: * http request handlers all move to pkg/server/handlers. * node password bootstrap auth handler goes into pkg/nodepassword with the other nodepassword code. While we're at it, also be more consistent about calling variables that hold a config.Control struct or reference `control` instead of `config` or `server`. Signed-off-by: Brad Davidson <[email protected]> (cherry picked from commit 2e4e7cf) Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]> (cherry picked from commit 5b1d57f) Signed-off-by: Brad Davidson <[email protected]>
Clients now generate keys client-side and send CSRs. If the server is down-level and sends a cert+key instead of just responding with a cert signed with the client's public key, we use the key from the server instead. Signed-off-by: Brad Davidson <[email protected]> (cherry picked from commit caeebc5) Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]> (cherry picked from commit 3653724) Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]> (cherry picked from commit f8271d8) Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]> (cherry picked from commit 8f8cfb5) Signed-off-by: Brad Davidson <[email protected]>
Convert nodepassword tests to use shared mocks Signed-off-by: Brad Davidson <[email protected]> (cherry picked from commit c20c063) Signed-off-by: Brad Davidson <[email protected]>
Make this field an interface instead of pointer to allow mocking. Not sure why wrangler has a type that returns an interface instead of just making it an interface itself. Wrangler in general is hard to mock for testing. Signed-off-by: Brad Davidson <[email protected]> (cherry picked from commit e632765) Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]> (cherry picked from commit f345697) Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]> (cherry picked from commit 9b1b90b) Signed-off-by: Brad Davidson <[email protected]>
k3s-io#11501 Signed-off-by: muicoder <[email protected]> (cherry picked from commit 0144d9b) Signed-off-by: Brad Davidson <[email protected]>
brandond
force-pushed
the
2025-01-backports_release-1.31
branch
from
66cbf27 to
9ae03e9
Compare
vitorsavian
approved these changes
Jan 10, 2025
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## release-1.31 #11566 +/- ##
================================================
- Coverage 47.62% 44.45% -3.17%
================================================
Files 181 184 +3
Lines 18794 19026 +232
================================================
- Hits 8950 8458 -492
- Misses 8499 9358 +859
+ Partials 1345 1210 -135
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
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
Backports:
Types of Changes
backports
Verification
see linked issues
Testing
Linked Issues
User-Facing Change
Further Comments