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.27] Backports for 2024-01 #9211

Merged
merged 21 commits into from
Jan 12, 2024
Merged

[release-1.27] Backports for 2024-01 #9211

merged 21 commits into from
Jan 12, 2024

Commits on Jan 10, 2024

  1. Remove GA feature-gates (k3s-io#8970) 

    Remove KubeletCredentialProviders and JobTrackingWithFinalizers feature-gates, both of which are GA and cannot be disabled.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 231cb6e)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    @brandond
    brandond committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    794104a View commit details
    Browse the repository at this point in the history

  2. Add ServiceLB support for PodHostIPs FeatureGate 

    If the feature-gate is enabled, use status.hostIPs for dual-stack externalTrafficPolicy=Local support

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit a27d660)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    @brandond
    brandond committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    34e439f View commit details
    Browse the repository at this point in the history

  3. chore: Bump Trivy version (k3s-io#8739) 

    Made with ❤️️ by updatecli

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    @github-actions @brandond
    github-actions[bot] authored and brandond committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    58948e3 View commit details
    Browse the repository at this point in the history

  4. optimize: Simplify and clean up Dockerfile (k3s-io#8244) 

    Signed-off-by: Leke Ariyo <lekeariyo2015@gmail.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    @Leke-Ariyo @brandond
    Leke-Ariyo authored and brandond committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    3ab2d18 View commit details
    Browse the repository at this point in the history

  5. Dockerfile.dapper: set $HOME properly 

    `$HOME` refers to `$DAPPER_SOURCE`, which is set in the same expression
and is thus not visible at the time of substitution.

This problem is not immediately visible with Docker, Inc.'s docker
merely because it resets an unset `$HOME` to `/root` (but still breaking
the Go cache). Under podman, this problem is immediately visible because
an unset `$HOME` remains unset and subsequently breaks the `go generate`
invocation.

Fixes k3s-io#9089.

Signed-off-by: Ivan Shapovalov <intelfx@intelfx.name>
(cherry picked from commit a7fe1aa)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    @intelfx @brandond
    intelfx authored and brandond committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    69402f0 View commit details
    Browse the repository at this point in the history

  6. Fix the OTHER log message that prints the wrong variable 

    Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 1e66362)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    @brandond
    brandond committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    895a9ff View commit details
    Browse the repository at this point in the history

  7. Handle logging flags when parsing kube-proxy args 

    Also adds a test to ensure this continues to work.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit db7091b)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    @brandond
    brandond committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    eb1677f View commit details
    Browse the repository at this point in the history

  8. Fix nil map in full snapshot configmap reconcile 

    If a full reconcile wins the race against sync of an individual snapshot resource, or someone intentionally deletes the configmap, the data map could be nil and cause a crash.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 319dca3)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    @brandond
    brandond committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    4cb2acd View commit details
    Browse the repository at this point in the history

  9. Add support for containerd cri registry config_path 

    Render cri registry mirrors.x.endpoints and configs.x.tls into config_path; keep
using mirrors.x.rewrites and configs.x.auth those do not yet have an
equivalent in the new format.

The new config file format allows disabling containerd's fallback to the
default endpoint when using mirror endpoints; a new CLI flag is added to
control that behavior.

This also re-shares some code that was unnecessarily split into parallel
implementations for linux/windows versions. There is probably more work
to be done on this front but it's a good start.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit c45524e)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    @brandond
    brandond committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    cddbaad View commit details
    Browse the repository at this point in the history

  10. Add more paths to crun runtime detection (k3s-io#9086) 

    * add usr/local paths for crun detection

Signed-off-by: Lex Rivera <me@lex.io>
(cherry picked from commit 5fe074b)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    @rlex @brandond
    rlex authored and brandond committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    eb29c46 View commit details
    Browse the repository at this point in the history

  11. Add runtime checking of golang version 

    Forces other groups packaging k3s to intentionally choose to build k3s with an unvalidated golang version

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit b297996)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    @brandond
    brandond committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    c003e6d View commit details
    Browse the repository at this point in the history

  12. Fix OS PRETTY_NAME on tagged releases 

    These were always showing up as dev due to the build arg not being set by the drone step.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit eae221f)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    @brandond
    brandond committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    c39bb59 View commit details
    Browse the repository at this point in the history

  13. Pin images instead of locking layers with lease 

    Layer leases never did what we wanted anyways, and this is the new approved interface for ensuring that images do not get GCd

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 5c99bdd)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    @brandond
    brandond committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    202be11 View commit details
    Browse the repository at this point in the history

  14. Move registries.yaml load into agent config 

    Moving it into config.Agent so that we can use or modify it outside the context of containerd setup

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 16d2939)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    @brandond
    brandond committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    f7b51fa View commit details
    Browse the repository at this point in the history

  15. Propagate errors up from config.Get 

    Fixes crash when killing agent while waiting for config from server

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 77846d6)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    @brandond
    brandond committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    e3d5156 View commit details
    Browse the repository at this point in the history

  16. Add ADR for embedded registry 

    Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit b8f3967)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    @brandond
    brandond committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    a6b56c1 View commit details
    Browse the repository at this point in the history

  17. Add server CLI flag and config fields for embedded registry 

    Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit ef90da5)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    @brandond
    brandond committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    f3d84a8 View commit details
    Browse the repository at this point in the history

  18. Add embedded registry implementation 

    Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 37e9b87)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    @brandond
    brandond committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    c938773 View commit details
    Browse the repository at this point in the history

  19. Add e2e test for embedded registry mirror 

    Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 6072476)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    @brandond
    brandond committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    b4a5fb1 View commit details
    Browse the repository at this point in the history

  20. Enable network policy controller metrics 

    Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit ab8d2f5)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
    @brandond
    brandond committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    aa4b1a7 View commit details
    Browse the repository at this point in the history

  21. Bump quic-go for CVE-2023-49295 

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