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.

Sign up for GitHub

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

Jump to bottom

[release-1.26] Backports for 2023-10 release #8616

Merged
merged 21 commits into from Oct 13, 2023
Merged

[release-1.26] Backports for 2023-10 release #8616

merged 21 commits into from Oct 13, 2023

Commits on Oct 12, 2023

  1. Disable HTTP on main etcd client port 

    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>
    @brandond
    brandond committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    6224913 View commit details
    Browse the repository at this point in the history

  2. Don't ignore assets in home dir if system assets exist 

    Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 1e38b5d)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    @brandond
    brandond committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    8506bae View commit details
    Browse the repository at this point in the history

  3. Pass SystemdCgroup setting through to nvidia runtime options 

    Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 0e5c760)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    @brandond
    brandond committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    2b08411 View commit details
    Browse the repository at this point in the history

  4. Bump containerd to v1.7.7-k3s1 

    Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 5fe4f67)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    @brandond
    brandond committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    48a2c09 View commit details
    Browse the repository at this point in the history

  5. Bump busybox to v1.36.1 

    Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 9bb1ce1)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    @brandond
    brandond committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    ee31497 View commit details
    Browse the repository at this point in the history

  6. Add ADR for etcd snapshot CRD migration 

    Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 22065af)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    @brandond
    brandond committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    6381b2f View commit details
    Browse the repository at this point in the history

  7. Minor updates as per design review discussion 

    Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 64107b5)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    @brandond
    brandond committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    8e668e8 View commit details
    Browse the repository at this point in the history

  8. Add new CRD for etcd snapshots 

    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>
    @brandond
    brandond committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    ae0a071 View commit details
    Browse the repository at this point in the history

  9. Move etcd snapshot code into separate file 

    Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 676b00a)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    @brandond
    brandond committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    23db370 View commit details
    Browse the repository at this point in the history

  10. Elide old snapshot data when apiserver rejects configmap with ErrRequ… 

    …estEntityTooLarge

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 2b0e2e8)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    @brandond
    brandond committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    f645bf3 View commit details
    Browse the repository at this point in the history

  11. Tidy s3 upload functions 

    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>
    @brandond
    brandond committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    3d2de0c View commit details
    Browse the repository at this point in the history

  12. Consistently set snapshotFile timestamp 

    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>
    @brandond
    brandond committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    b33d9f5 View commit details
    Browse the repository at this point in the history

  13. Move s3 snapshot list functionality to s3.go 

    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>
    @brandond
    brandond committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    b5cb1b0 View commit details
    Browse the repository at this point in the history

  14. Store extra metadata and cluster ID for snapshots 

    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>
    @brandond
    brandond committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    9705b6a View commit details
    Browse the repository at this point in the history

  15. Sort snapshots by time and key in tabwriter output 

    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>
    @brandond
    brandond committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    eecb577 View commit details
    Browse the repository at this point in the history

  16. Move snapshot delete into local/s3 functions 

    Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 5cd4f69)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    @brandond
    brandond committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    eb62b15 View commit details
    Browse the repository at this point in the history

  17. Switch to managing ETCDSnapshotFile resources 

    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>
    @brandond
    brandond committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    95c7161 View commit details
    Browse the repository at this point in the history

  18. Add server token hash to CR and S3 

    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>
    @brandond
    brandond committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    ebcca50 View commit details
    Browse the repository at this point in the history

  19. Fix etcd snapshot integration tests 

    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
    brandond committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    619f6b6 View commit details
    Browse the repository at this point in the history

  20. Switch build target from main.go to a package. (k3s-io#8342) 

    * 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>
    @dlorenc @dereknola @brandond
    2 people authored and brandond committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    b2bb944 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2023

  1. Bump traefik, golang.org/x/net, google.golang.org/grpc 

    Fixes exposure to CVE-2023-39325

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    @brandond
    brandond committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    c698567 View commit details
    Browse the repository at this point in the history