-
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
[release-1.26] Backports for 2023-11 release #8879
Merged
brandond
merged 10 commits into
k3s-io:release-1.26
from
brandond:2023-11-backports_release-1.26
Nov 16, 2023
Merged
[release-1.26] Backports for 2023-11 release #8879
brandond
merged 10 commits into
k3s-io:release-1.26
from
brandond:2023-11-backports_release-1.26
Nov 16, 2023
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
Signed-off-by: Thorsten Klein <tk@thklein.io> (cherry picked from commit a264416) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Ref: https://github.com/k3s-io/kine/releases/tag/v0.11.0 Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit 32a1efa) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Problem: Configuring qos-class features in containerd requres a custom containerd configuration template. Solution: Look for configuration files in default locations and configure containerd to use them if they exist. Signed-off-by: Oliver Larsson <larsson.e.oliver@gmail.com> (cherry picked from commit 30c8ad9) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
* add node flag disable-agent-lb * add agent flag disable-apiserver-lb Co-authored-by: Brad Davidson <brad@oatmail.org> Signed-off-by: chenk008 <kongchen28@gmail.com> (cherry picked from commit b47cbbf) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Omit snapshot list configmap entries for snapshots without extra metadata; reduce log level of warnings about missing s3 metadata files. Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit 2088218) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit 7ecd587) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
* Tweaked order of ingress IPs in ServiceLB Previously, ingress IPs were only string-sorted when returned Sorted by IP family and string-sorted in each family as part of filterByIPFamily method * Update pkg/cloudprovider/servicelb.go * Formatting Signed-off-by: Jason Costello <jason@hazy.com> Co-authored-by: Brad Davidson <brad@oatmail.org> (cherry picked from commit 07ee854) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
* Disable helm CRD installation for disable-helm-controller The NewContext package requires config as input which would require all third-party callers to update when the new go module is published. This change only affects the behaviour of installation of helm CRDs. Existing helm crds installed in a cluster would not be removed when disable-helm-controller flag is set on the server. Addresses k3s-io#8701 * address review comments * remove redundant check Signed-off-by: Harsimran Singh Maan <maan.harry@gmail.com> (cherry picked from commit abc2efd) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Also: * Replaces labeled for/continue RETRY loops with wait helpers for improved readability * Pulls secrets and nodes from cache for node password verification * Migrate nodepassword tests to wrangler mocks for better code reuse Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
vitorsavian
approved these changes
Nov 16, 2023
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## release-1.26 #8879 +/- ##
================================================
+ Coverage 17.47% 17.48% +0.01%
================================================
Files 94 93 -1
Lines 6319 6314 -5
================================================
Hits 1104 1104
+ Misses 4982 4977 -5
Partials 233 233
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 for:
Types of Changes
Verification
Testing
See linked issues
Linked Issues
User-Facing Change
Further Comments