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.24] Backports for 2023-07 release #7910

Merged
merged 2 commits into from
Jul 7, 2023
Merged

[release-1.24] Backports for 2023-07 release #7910

merged 2 commits into from
Jul 7, 2023

Commits on Jul 7, 2023

  1. Add --data-dir to the k3s certificate rotate-ca cli (k3s-io#7791) 

    Need to add a cli flag for this. Also, should probably have config file loading support for the certificate commands.

Signed-off-by: leilei.zhai <leilei.zhai@qingteng.cn>
(cherry picked from commit 72d50b1)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    @zhaileilei123 @brandond
    zhaileilei123 authored and brandond committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    1c87ed7 View commit details
    Browse the repository at this point in the history

  2. Fall back to basic/bearer auth when node identity auth is rejected 

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