[release-1.26] Backports for 2023-10 release #8616
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
Fixes performance issue under load, ref: etcd-io/etcd#15402 and kubernetes/kubernetes#118460 Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit 8c73fd6) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit 1e38b5d) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit 0e5c760) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit 5fe4f67) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit 9bb1ce1) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit 22065af) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit 64107b5) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Also adds a hack go script to print the embedded CRDs, for developer use. Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit 500744b) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit 676b00a) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
…estEntityTooLarge Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit 2b0e2e8) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Consistently refer to object keys as such, simplify error handling. Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit f1afe15) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Attempt to use timestamp from creation or filename instead of file/object modification times Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit 8d47645) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Also, don't list ONLY s3 snapshots if S3 is enabled. Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit 80f909d) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Write the extra metadata both locally and to S3. These files are placed such that they will not be used by older versions of K3s that do not make use of them. Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit 7464007) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Fixes snapshot list coming out in non-deterministic order Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit a15b804) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit 5cd4f69) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Reconcile snapshot CRs instead of ConfigMap; manage ConfigMap downstream from CR list Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit 550ab36) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
This required pulling the token hash stuff out of the cluster package, into util. Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit d885162) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Snapshot delete/prune tests were only working because the delete command would report success even when deleting a snapshot that didn't exist, and the test regex was finding the snapshot name multiple times in the list output and deleting it twice. Snapshot restore tests seem to have expected the deployment to be rolled out immediately, which is not a reasonable expectation. Signed-off-by: Brad Davidson <brad.davidson@rancher.com> (cherry picked from commit 7c5b69c) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond
force-pushed
the
2023-10-backports_release-1.26
branch
from
dff886e
to
619f6b6
Compare
* Switch build target from main.go to a package. * Dont build with vcs Signed-off-by: Dan Lorenc <dlorenc@chainguard.dev> Signed-off-by: Derek Nola <derek.nola@suse.com> Co-authored-by: Derek Nola <derek.nola@suse.com> (cherry picked from commit 3d25e9f) Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
vitorsavian
approved these changes
Oct 12, 2023
Fixes exposure to CVE-2023-39325 Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
|
S390x is having issues, all other tests are passing. Merging. |
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.
Types of Changes
Backports for:
Verification
Testing
See linked issues
Linked Issues
k3s check-configdoes not respect rootless mode #8485runtimeClassName: nvidiaget killed after a few seconds #8472User-Facing Change
Further Comments