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.

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.31] Backports for 2024-11 #7289

Merged

Commits on Nov 13, 2024

  1. Bump K3s version for release-1.31

    Updates k3s: k3s-io/k3s@0955fa3...4a3ea1c
    
    Signed-off-by: Brad Davidson <[email protected]>
    brandond committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    53dd48d View commit details
    Browse the repository at this point in the history
  2. Sync CLI flags with k3s

    Signed-off-by: Brad Davidson <[email protected]>
    (cherry picked from commit f4cbef9)
    Signed-off-by: Brad Davidson <[email protected]>
    brandond committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    ce0444a View commit details
    Browse the repository at this point in the history
  3. Bump containerd and etcd to sync with k3s

    Signed-off-by: Brad Davidson <[email protected]>
    (cherry picked from commit 3231a38)
    Signed-off-by: Brad Davidson <[email protected]>
    brandond committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    6d3b3f7 View commit details
    Browse the repository at this point in the history
  4. Only clean up pod filesystems if umount succeeds

    Signed-off-by: Brad Davidson <[email protected]>
    (cherry picked from commit abfac1f)
    Signed-off-by: Brad Davidson <[email protected]>
    brandond committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    3cb2900 View commit details
    Browse the repository at this point in the history
  5. Remove special hostname behavior for aws cloud-provider

    The in-tree aws cloud provider has been removed and the kubelet will fail to start if the cloud-provider-name is set to aws, so this is dead code.
    
    Signed-off-by: Brad Davidson <[email protected]>
    (cherry picked from commit 89a8d81)
    Signed-off-by: Brad Davidson <[email protected]>
    brandond committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    b421745 View commit details
    Browse the repository at this point in the history