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.25] Backports for 2023-08 release #8132

Merged
merged 9 commits into from
Aug 4, 2023
Merged

[release-1.25] Backports for 2023-08 release #8132

merged 9 commits into from
Aug 4, 2023

Commits on Aug 4, 2023

  1. Add support for {{ template "base" . }} in etc/containerd/config.to… 

    …ml.tmpl (k3s-io#7991)

Signed-off-by: Simon Kirsten <[email protected]>
(cherry picked from commit 546dc24)
Signed-off-by: Brad Davidson <[email protected]>
    @skirsten @brandond
    skirsten authored and brandond committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    eb500f8 View commit details
    Browse the repository at this point in the history

  2. Make apiserver egress args conditional on egress-selector-mode 

    Only configure enable-aggregator-routing and egress-selector-config-file
if required by egress-selector-mode.

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit f21ae1d)
Signed-off-by: Brad Davidson <[email protected]>
    @brandond
    brandond committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    a1868dd View commit details
    Browse the repository at this point in the history

  3. Security bump to docker/distribution (k3s-io#8047) 

    Signed-off-by: Guilherme Macedo <[email protected]>
(cherry picked from commit cc9dce5)
Signed-off-by: Brad Davidson <[email protected]>
    @macedogm @brandond
    macedogm authored and brandond committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    7a92a97 View commit details
    Browse the repository at this point in the history

  4. Add FilterCN function to prevent SAN Stuffing 

    Wire up a node watch to collect addresses of server nodes, to prevent adding unauthorized SANs to the dynamiclistener cert.

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit aa76942)
Signed-off-by: Brad Davidson <[email protected]>
    @brandond
    brandond committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    4be6ab1 View commit details
    Browse the repository at this point in the history

  5. Bump docker/docker to latest v20.10 

    Fixes issue with invalid HTTP host headers over unix sockets caused by
recent releases of golang rejecting invalid header values.

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit a0da8ed)
Signed-off-by: Brad Davidson <[email protected]>
    @brandond
    brandond committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    97eca1b View commit details
    Browse the repository at this point in the history

  6. Bump versions for containerd, runc, kine 

    Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 23d6842)
Signed-off-by: Brad Davidson <[email protected]>
    @brandond
    brandond committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    4f14d61 View commit details
    Browse the repository at this point in the history

  7. Bump kine to v0.10.2 

    Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit fd53114)
Signed-off-by: Brad Davidson <[email protected]>
    @brandond
    brandond committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    67ce287 View commit details
    Browse the repository at this point in the history

  8. Use 'go list -m' instead of grep to look up versions 

    Signed-off-by: Brad Davidson <[email protected]>
    @brandond
    brandond committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    e85465f View commit details
    Browse the repository at this point in the history

  9. Use VERSION_K8S in tests instead of grep go.mod 

    Signed-off-by: Brad Davidson <[email protected]>
    @brandond
    brandond committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    afecc77 View commit details
    Browse the repository at this point in the history