Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[release-1.29] Backports for 2025-02 #11738

Merged
merged 28 commits into from
Feb 10, 2025

Conversation

brandond
Copy link
Member

@brandond brandond commented Feb 10, 2025

Proposed Changes

Backports:

Skipped 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.
The containerd config templates for linux and windows have been consolidated and are no longer os-specific.
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 2.11.20

Further Comments

majabojarska and others added 28 commits February 10, 2025 10:03
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 <majabojarska98@gmail.com>
(cherry picked from commit 646e313)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit fd83483)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit e808d3e)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 95700aa)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
* 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 <brad.davidson@rancher.com>
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 <brad.davidson@rancher.com>
(cherry picked from commit 0d028a2)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 1b578b4)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit eec2a53)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 85b3775)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
…verage

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 5c8f236)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit d6d361e)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 20dda23)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 9bdab19)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 0d15457)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 4cacf6e)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 8f85ee3)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit b2418ba)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 838d687)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit bf97b8f)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 8aa412e)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 50326c8)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 85987ac)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 99f4f5a)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
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 <brad.davidson@rancher.com>
(cherry picked from commit 96c2dd3)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 3aa24cd)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 04ed6c0)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Don't block other linux steps on building the windows binary

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 20a9a6b)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@brandond brandond requested a review from a team as a code owner February 10, 2025 10:13
Copy link

codecov bot commented Feb 10, 2025

Codecov Report

Attention: Patch coverage is 24.42997% with 232 lines in your changes missing coverage. Please review.

Project coverage is 45.54%. Comparing base (5fbd9c0) to head (75b96ec).
Report is 28 commits behind head on release-1.29.

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 21.05% 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/cli/server/server.go 20.00% 3 Missing and 1 partial ⚠️
pkg/cli/agent/agent.go 25.00% 2 Missing and 1 partial ⚠️
pkg/util/permissions/permissions_others.go 40.00% 2 Missing and 1 partial ⚠️
... and 3 more
Additional details and impacted files
@@               Coverage Diff                @@
##           release-1.29   #11738      +/-   ##
================================================
- Coverage         48.96%   45.54%   -3.43%     
================================================
  Files               186      206      +20     
  Lines             19531    19689     +158     
================================================
- Hits               9564     8967     -597     
- Misses             8580     9400     +820     
+ Partials           1387     1322      -65     
Flag Coverage Δ
e2etests 39.79% <13.84%> (-4.38%) ⬇️
inttests 34.89% <13.46%> (-0.16%) ⬇️
unittests 16.12% <13.68%> (-0.68%) ⬇️

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 8d35106 into k3s-io:release-1.29 Feb 10, 2025
48 checks passed
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants