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.30] Backports for 2024-07 release cycle #10497

Merged
merged 13 commits into from
Jul 15, 2024

Commits on Jul 11, 2024

  1. Bump k3s-root to v0.14.0

    Also remove the wg-add script that has been unused since v1.26 dropped the legacy wireguard backend
    
    Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    (cherry picked from commit 047664b)
    Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    brandond committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    e137885 View commit details
    Browse the repository at this point in the history
  2. Bump github.com/hashicorp/go-retryablehttp from 0.7.4 to 0.7.7

    Bumps [github.com/hashicorp/go-retryablehttp](https://github.com/hashicorp/go-retryablehttp) from 0.7.4 to 0.7.7.
    - [Changelog](https://github.com/hashicorp/go-retryablehttp/blob/main/CHANGELOG.md)
    - [Commits](hashicorp/go-retryablehttp@v0.7.4...v0.7.7)
    
    ---
    updated-dependencies:
    - dependency-name: github.com/hashicorp/go-retryablehttp
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    (cherry picked from commit f6942f3)
    Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    dependabot[bot] authored and brandond committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    f0e41c1 View commit details
    Browse the repository at this point in the history
  3. Bump Local Path Provisioner version (k3s-io#10394)

    * chore: Bump Local Path Provisioner version
    
    Made with ❤️️ by updatecli
    
    ---------
    
    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    (cherry picked from commit a0b3745)
    Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    github-actions[bot] authored and brandond committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    59b6736 View commit details
    Browse the repository at this point in the history
  4. chore: Bump golang:alpine version

    Made with ❤️️ by updatecli
    
    (cherry picked from commit 0b41738)
    Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    github-actions[bot] authored and brandond committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    e88a5d3 View commit details
    Browse the repository at this point in the history
  5. Ensure remotedialer kubelet connections use kubelet bind address

    Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    (cherry picked from commit eb8bd15)
    Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    brandond committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    b6ba5e1 View commit details
    Browse the repository at this point in the history
  6. chore: Bump Trivy version

    Made with ❤️️ by updatecli
    
    (cherry picked from commit 5508589)
    Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    github-actions[bot] authored and brandond committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    945ca55 View commit details
    Browse the repository at this point in the history
  7. Add etcd s3 config secret implementation

    * Move snapshot structs and functions into pkg/etcd/snapshot
    * Move s3 client code and functions into pkg/etcd/s3
    * Refactor pkg/etcd to track snapshot and s3 moves
    * Add support for reading s3 client config from secret
    * Add minio client cache, since S3 client configuration can now be
      changed at runtime by modifying the secret, and don't want to have to
      create a new minio client every time we read config.
    * Add tests for pkg/etcd/s3
    
    Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    (cherry picked from commit c36db53)
    Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    brandond committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    dbc7976 View commit details
    Browse the repository at this point in the history
  8. Bump kine to v0.11.11

    k3s-io/kine@v0.11.9...v0.11.11
    Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    brandond committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    28c58e9 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2024

  1. Fix reentrant rlock in loadbalancer.dialContext

    Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    brandond committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    0c7ddd0 View commit details
    Browse the repository at this point in the history
  2. Fix agents removing configured supervisor address

    We shouldn't be replacing the configured server address on agents. Doing
    so breaks the agent's ability to fall back to the fixed registration
    endpoint when all servers are down, since we replaced it with the first
    discovered apiserver address. The fixed registration endpoint will be
    restored as default when the service is restarted, but this is not the
    correct behavior. This should have only been done on etcd-only nodes
    that start up using their local supervisor, but need to switch to a
    control-plane node as soon as one is available.
    
    Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    brandond committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    b1a5e0c View commit details
    Browse the repository at this point in the history
  3. Fix IPv6 primary node-ip handling

    I should have caught `[]string{cfg.NodeIP}[0]` and `[]string{envInfo.NodeIP.String()}[0]` in code review...
    
    Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    brandond committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    001a6d9 View commit details
    Browse the repository at this point in the history
  4. Add dial duration to debug error message

    This should give us more detail on how long dials take before failing, so that we can perhaps better tune the retry loop in the future.
    
    Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    brandond committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    bfbe5d6 View commit details
    Browse the repository at this point in the history
  5. Don't use server and token values from config file for etcd-snapshot …

    …commands
    
    Fixes an issue where running etcd-snapshot commands on a node that has a server address set in the config will manage snapshots on that server, instead of on the local node as intended.
    
    Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    brandond committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    04717e5 View commit details
    Browse the repository at this point in the history