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.28] Backports for 2024-10 #11063

Merged
merged 12 commits into from
Oct 10, 2024
Merged

[release-1.28] Backports for 2024-10 #11063

merged 12 commits into from
Oct 10, 2024

Conversation

brandond
Copy link
Member

Proposed Changes

Backports:

Types of Changes

backports

Verification

see linked issues

Testing

Linked Issues

User-Facing Change

Further Comments

brandond and others added 12 commits October 10, 2024 07:12
@brandond
Use static CNI bin dir
0dce3b5 
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>
@brandond
Bump kine to v0.13.0
310852e 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit cda31eb)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@brandond
Bump traefik to chart 27.0.2 / appVersion v2.11.10
cf699f9 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 6c6d87d)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@brandond
Bump kine
719e21f 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit c9e7b05)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@brandond
Fix sqlite endpoint when migrating from sqlite to etcd
90338d9 
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>
@brandond
Fix race condition when multiple nodes reconcile S3 snapshots
61dee67 
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>
@brandond
Add ca-cert rotation integration test
14afa24 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit b1a42e5)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@brandond
Fix issue that caused passwd file and psk to be regenerated when rota…
a887ad6 
…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>
@brandond
Update tcpproxy for import path change
159dc9b 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 1ae9ca7)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@github-actions @brandond
chore: Bump Local Path Provisioner version
8a9fb74 
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>
@brandond
Bump local-path-provisioner to v0.0.30
b037387 
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit b0ad6d8)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@brandond
Bump helm-controller and klipper-helm
9bf1a8b 
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:13
@codecov Codecov
Copy link

codecov bot commented Oct 10, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 0% with 40 lines in your changes missing coverage. Please review.

Project coverage is 36.08%. Comparing base (eac26ef) to head (9bf1a8b).
Report is 14 commits behind head on release-1.28.

Files with missing lines Patch % Lines
pkg/etcd/snapshot.go 0.00% 15 Missing ⚠️
pkg/server/cert.go 0.00% 14 Missing ⚠️
pkg/etcd/s3/s3.go 0.00% 10 Missing ⚠️
pkg/etcd/etcd.go 0.00% 1 Missing ⚠️
Additional details and impacted files 
@@               Coverage Diff                @@
##           release-1.28   #11063      +/-   ##
================================================
- Coverage         40.87%   36.08%   -4.79%     
================================================
  Files               179      162      -17     
  Lines             18567    14282    -4285     
================================================
- Hits               7589     5154    -2435     
+ Misses             9695     8131    -1564     
+ Partials           1283      997     -286
Flag Coverage Δ
e2etests 36.08% <0.00%> (-9.79%) ⬇️
unittests ?

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 63c5e1d into k3s-io:release-1.28 Oct 10, 2024
30 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rbrtbnfgl rbrtbnfgl rbrtbnfgl approved these changes

@cwayne18 cwayne18 cwayne18 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@brandond @cwayne18 @rbrtbnfgl