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.30] Backports for 2024-10 #11061

Merged
merged 12 commits into from
Oct 10, 2024

Conversation

brandond and others added 12 commits October 10, 2024 00:23
Maintain a separate dir for CNI binaries so that additional plugins can be installed in a predictable location that does not change every time k3s is upgraded.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit ed14f7f)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit cda31eb)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 6c6d87d)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit c9e7b05)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Support for 'sqlite' as the endpoint was removed in
k3s-io/kine#320 and the constant removed in
k3s-io/kine#325

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 0942e6a)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Don't delete s3 etcdsnapshotfiles if they are missing from s3 but less than a minute old, its possible the other node just finished uploading it and the object key has not yet become visible.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 0826ebc)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit b1a42e5)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
…ting CA certs

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit c6392c9)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 1ae9ca7)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Made with ❤️️ by updatecli

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit c00af8e)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit b0ad6d8)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 7552203)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@brandond brandond requested a review from a team as a code owner October 10, 2024 07:11
Copy link

codecov bot commented Oct 10, 2024

Codecov Report

Attention: Patch coverage is 17.50000% with 33 lines in your changes missing coverage. Please review.

Project coverage is 43.72%. Comparing base (0a2b383) to head (d861f01).
Report is 14 commits behind head on release-1.30.

Files with missing lines Patch % Lines
pkg/server/cert.go 0.00% 14 Missing ⚠️
pkg/etcd/snapshot.go 13.33% 13 Missing ⚠️
pkg/etcd/s3/s3.go 50.00% 2 Missing and 3 partials ⚠️
pkg/etcd/etcd.go 0.00% 1 Missing ⚠️

❗ There is a different number of reports uploaded between BASE (0a2b383) and HEAD (d861f01). Click for more details.

HEAD has 1 upload less than BASE
Flag BASE (0a2b383) HEAD (d861f01)
e2etests 7 6
Additional details and impacted files
@@               Coverage Diff                @@
##           release-1.30   #11061      +/-   ##
================================================
- Coverage         49.50%   43.72%   -5.78%     
================================================
  Files               178      178              
  Lines             14931    14944      +13     
================================================
- Hits               7391     6534     -857     
- Misses             6199     7208    +1009     
+ Partials           1341     1202     -139     
Flag Coverage Δ
e2etests 36.39% <0.00%> (-9.80%) ⬇️
inttests 36.85% <5.00%> (+0.12%) ⬆️
unittests 13.43% <12.50%> (+<0.01%) ⬆️

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 7b084d4 into k3s-io:release-1.30 Oct 10, 2024
30 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