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.32] Backports for 2025-02 #11730

Merged
merged 32 commits into from
Feb 10, 2025

Conversation

brandond
Copy link
Member

@brandond brandond commented Feb 7, 2025

Proposed Changes

Backports:

Types of Changes

backports

Verification

see linked issues

Testing

Linked Issues

User-Facing Change

Align the CLI-reported default `--etcd-snapshot-dir` value with the actual one (`server`, `etcd-snapshot` commands).
Disable s3 transport transparent compression/decompression
etcd snapshot backup/restore now supports loading s3 credentials from an AWS SDK shared credentials file.
Bump klipper-helm to v0.9.4
Bump klipper-lb to v0.4.10
Bump spegel to v0.0.30
Bump local-path-provisioner to v0.0.31
Bump kine to v0.13.8
Bump etcd to v3.5.18
Bump traefik to 3.3.2
Containerd has been bumped to version 2.0.
  The containerd config templates for linux and windows have been consolidated and are no longer os-specific.
  Containerd 2.0 uses a new config file schema. If you are using a custom containerd config template, you should migrate your template to `config-v3.toml.tmpl` to switch to the new version. See the [upstream documentation](https://github.com/containerd/containerd/blob/release/2.0/docs/cri/config.md) for more information.

Further Comments

majabojarska and others added 30 commits February 7, 2025 22:46
The effective snapshot dir is "${data-dir}/server/db/snapshots". The
server segment is missing in the CLI-reported default path, potentially
misleading the user about the actual default snapshot destination.

Signed-off-by: Maja Bojarska <[email protected]>
(cherry picked from commit 646e313)
Signed-off-by: Brad Davidson <[email protected]>
* Bump klipper-lb to v0.4.10

Bump klipper-helm to v0.9.4
Signed-off-by: Derek Nola <[email protected]>

* Bump helm-controller

Signed-off-by: Derek Nola <[email protected]>

---------

Signed-off-by: Derek Nola <[email protected]>
(cherry picked from commit 08c30f5)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit fd83483)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit e808d3e)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 95700aa)
Signed-off-by: Brad Davidson <[email protected]>
* chore: Bump Local Path Provisioner version

Made with ❤️️ by updatecli

* 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 28300ea)
Signed-off-by: Brad Davidson <[email protected]>
Also adds a CLI flag and fields for session token, which must be passed
alongside the access key and secret when using temporary credentials.

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 0d028a2)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 1b578b4)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit eec2a53)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 85b3775)
Signed-off-by: Brad Davidson <[email protected]>
…verage

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 5c8f236)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit d6d361e)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 20dda23)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 9bdab19)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 0d15457)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 4cacf6e)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 8f85ee3)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit b2418ba)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 838d687)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit bf97b8f)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 8aa412e)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 50326c8)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 85987ac)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 99f4f5a)
Signed-off-by: Brad Davidson <[email protected]>
Netpol startup is skipped with a warning on linux if ipset support is missing, we should do the same on windows

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 96c2dd3)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 3aa24cd)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 77cf99a)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 04ed6c0)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 124e46b)
Signed-off-by: Brad Davidson <[email protected]>
Ref: https://github.com/containerd/containerd/blob/release/2.0/docs/cri/config.md

Since this is a breaking change, add support for a new v3 template file. If no v3 template is present, fall back to checking for the legacy v2 template and render the old structure.

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit bc45972)
Signed-off-by: Brad Davidson <[email protected]>
Don't block other linux steps on building the windows binary

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 20a9a6b)
Signed-off-by: Brad Davidson <[email protected]>
@brandond brandond requested a review from a team as a code owner February 7, 2025 23:00
Copy link

codecov bot commented Feb 8, 2025

Codecov Report

Attention: Patch coverage is 32.71277% with 253 lines in your changes missing coverage. Please review.

Project coverage is 46.80%. Comparing base (e89c8c0) to head (8a893d7).
Report is 32 commits behind head on release-1.32.

Files with missing lines Patch % Lines
pkg/spegel/bootstrap.go 1.03% 96 Missing ⚠️
pkg/spegel/spegel.go 0.00% 36 Missing ⚠️
pkg/util/permissions/permissions_windows.go 0.00% 30 Missing ⚠️
pkg/agent/config/config.go 28.57% 10 Missing and 5 partials ⚠️
pkg/agent/config/config_linux.go 42.30% 14 Missing and 1 partial ⚠️
pkg/clientaccess/token.go 54.54% 12 Missing and 3 partials ⚠️
pkg/agent/config/config_windows.go 0.00% 10 Missing ⚠️
pkg/agent/containerd/config_linux.go 53.84% 5 Missing and 1 partial ⚠️
pkg/agent/containerd/config.go 80.00% 3 Missing and 1 partial ⚠️
pkg/agent/containerd/config_windows.go 55.55% 4 Missing ⚠️
... and 7 more
Additional details and impacted files
@@               Coverage Diff                @@
##           release-1.32   #11730      +/-   ##
================================================
- Coverage         49.70%   46.80%   -2.91%     
================================================
  Files               186      206      +20     
  Lines             19363    19519     +156     
================================================
- Hits               9624     9135     -489     
- Misses             8344     9057     +713     
+ Partials           1395     1327      -68     
Flag Coverage Δ
e2etests 40.37% <23.36%> (-3.87%) ⬇️
inttests 35.02% <21.18%> (-0.12%) ⬇️
unittests 16.43% <20.21%> (-0.51%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@brandond brandond merged commit ff63695 into k3s-io:release-1.32 Feb 10, 2025
48 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants