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.28] Backports for 2024-07 release cycle #10499

Merged
merged 12 commits into from
Jul 15, 2024

Conversation

brandond and others added 7 commits July 11, 2024 22:15
Also remove the wg-add script that has been unused since v1.26 dropped the legacy wireguard backend

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 047664b)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Bumps [github.com/hashicorp/go-retryablehttp](https://github.com/hashicorp/go-retryablehttp) from 0.7.4 to 0.7.7.
- [Changelog](https://github.com/hashicorp/go-retryablehttp/blob/main/CHANGELOG.md)
- [Commits](hashicorp/go-retryablehttp@v0.7.4...v0.7.7)

---
updated-dependencies:
- dependency-name: github.com/hashicorp/go-retryablehttp
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit f6942f3)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
* 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 a0b3745)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit eb8bd15)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
Made with ❤️️ by updatecli

(cherry picked from commit 5508589)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
* Move snapshot structs and functions into pkg/etcd/snapshot
* Move s3 client code and functions into pkg/etcd/s3
* Refactor pkg/etcd to track snapshot and s3 moves
* Add support for reading s3 client config from secret
* Add minio client cache, since S3 client configuration can now be
  changed at runtime by modifying the secret, and don't want to have to
  create a new minio client every time we read config.
* Add tests for pkg/etcd/s3

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit c36db53)
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
k3s-io/kine@v0.11.9...v0.11.11
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@brandond brandond requested a review from a team as a code owner July 11, 2024 22:58
Copy link

codecov bot commented Jul 12, 2024

Codecov Report

Attention: Patch coverage is 4.46304% with 685 lines in your changes missing coverage. Please review.

Project coverage is 35.87%. Comparing base (d076d9a) to head (d18169b).

Files Patch % Lines
pkg/etcd/s3/s3.go 0.00% 309 Missing ⚠️
pkg/etcd/snapshot/types.go 0.00% 122 Missing ⚠️
pkg/etcd/snapshot.go 0.00% 98 Missing ⚠️
pkg/etcd/s3/config_secret.go 1.78% 55 Missing ⚠️
pkg/etcd/etcd.go 6.89% 27 Missing ⚠️
pkg/etcd/snapshot_handler.go 0.00% 22 Missing ⚠️
pkg/agent/tunnel/tunnel.go 44.00% 13 Missing and 1 partial ⚠️
pkg/cli/server/server.go 0.00% 13 Missing and 1 partial ⚠️
pkg/etcd/snapshot_controller.go 0.00% 10 Missing ⚠️
pkg/agent/run.go 11.11% 8 Missing ⚠️
... and 3 more

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

HEAD has 15 uploads less than BASE
Flag BASE (d076d9a) HEAD (d18169b)
unittests 3 0
inttests 2 0
e2etests 16 6
Additional details and impacted files
@@               Coverage Diff                @@
##           release-1.28   #10499      +/-   ##
================================================
- Coverage         43.05%   35.87%   -7.19%     
================================================
  Files               163      162       -1     
  Lines             17606    14186    -3420     
================================================
- Hits               7581     5089    -2492     
+ Misses             8740     8102     -638     
+ Partials           1285      995     -290     
Flag Coverage Δ
e2etests 35.87% <4.46%> (-10.08%) ⬇️
inttests ?
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.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
We shouldn't be replacing the configured server address on agents. Doing
so breaks the agent's ability to fall back to the fixed registration
endpoint when all servers are down, since we replaced it with the first
discovered apiserver address. The fixed registration endpoint will be
restored as default when the service is restarted, but this is not the
correct behavior. This should have only been done on etcd-only nodes
that start up using their local supervisor, but need to switch to a
control-plane node as soon as one is available.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
I should have caught `[]string{cfg.NodeIP}[0]` and `[]string{envInfo.NodeIP.String()}[0]` in code review...

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
This should give us more detail on how long dials take before failing, so that we can perhaps better tune the retry loop in the future.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@brandond brandond force-pushed the 2024-07-backports_release-1.28 branch 2 times, most recently from 92fbbd7 to 85424f2 Compare July 14, 2024 01:42
…commands

Fixes an issue where running etcd-snapshot commands on a node that has a server address set in the config will manage snapshots on that server, instead of on the local node as intended.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
@brandond brandond force-pushed the 2024-07-backports_release-1.28 branch from 85424f2 to d18169b Compare July 14, 2024 20:52
@brandond brandond merged commit 50a0380 into k3s-io:release-1.28 Jul 15, 2024
28 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.

2 participants