[release-1.28] Backports for 2024-01 #9203
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
Remove KubeletCredentialProviders and JobTrackingWithFinalizers feature-gates, both of which are GA and cannot be disabled. Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit 231cb6e) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
If the feature-gate is enabled, use status.hostIPs for dual-stack externalTrafficPolicy=Local support Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit a27d660) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
`$HOME` refers to `$DAPPER_SOURCE`, which is set in the same expression and is thus not visible at the time of substitution. This problem is not immediately visible with Docker, Inc.'s docker merely because it resets an unset `$HOME` to `/root` (but still breaking the Go cache). Under podman, this problem is immediately visible because an unset `$HOME` remains unset and subsequently breaks the `go generate` invocation. Fixes k3s-io#9089. Signed-off-by: Ivan Shapovalov <intelfx@intelfx.name> (cherry picked from commit a7fe1aa) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit 1e66362) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Also adds a test to ensure this continues to work. Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit db7091b) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
If a full reconcile wins the race against sync of an individual snapshot resource, or someone intentionally deletes the configmap, the data map could be nil and cause a crash. Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit 319dca3) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
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> (cherry picked from commit c45524e) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
* add usr/local paths for crun detection Signed-off-by: Lex Rivera <me@lex.io> (cherry picked from commit 5fe074b) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Forces other groups packaging k3s to intentionally choose to build k3s with an unvalidated golang version Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit b297996) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
These were always showing up as dev due to the build arg not being set by the drone step. Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit eae221f) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Layer leases never did what we wanted anyways, and this is the new approved interface for ensuring that images do not get GCd Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit 5c99bdd) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Moving it into config.Agent so that we can use or modify it outside the context of containerd setup Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit 16d2939) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Fixes crash when killing agent while waiting for config from server Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit 77846d6) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit b8f3967) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit ef90da5) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit 37e9b87) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit 6072476) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit ab8d2f5) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
vitorsavian
approved these changes
Jan 10, 2024
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## release-1.28 #9203 +/- ##
================================================
- Coverage 46.65% 44.71% -1.95%
================================================
Files 148 154 +6
Lines 15948 16497 +549
================================================
- Hits 7441 7377 -64
- Misses 7295 7940 +645
+ Partials 1212 1180 -32
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
backport
Verification
See linked issues
Testing
Linked Issues
status.hostIPsfor ServiceLB pods #9138K3s dev#9141User-Facing Change
Further Comments