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.29] Backports for 2024-11 #11263

Merged

Conversation

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit e34fe03)
Signed-off-by: Brad Davidson <[email protected]>
* Use clientv3.NewCtxClient instead of New to avoid automatic retry of all RPCs
* Only timeout status requests; allow defrag and alarm clear requests to run to completion.
* Only clear alarms on the local cluster member, not ALL cluster members

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 095e34d)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit a39e191)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit bc60ff7)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit b67249e)
Signed-off-by: Brad Davidson <[email protected]>
Add new flag that is passed through to the device_ownership_from_security_context parameter in the containerd CRI config. This is not possible to change without providing a complete custom containerd.toml template so we should add a flag for it.

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 56fb3b0)
Signed-off-by: Brad Davidson <[email protected]>
@brandond brandond requested a review from a team as a code owner November 6, 2024 19:29
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 917761c)
Signed-off-by: Brad Davidson <[email protected]>
External CLI actions cannot short-circuit on --help or --version, so we
cannot skip loading the config file if these flags are present when
running these wrapped commands. The behavior of just returning the
override flag name instead of the requested flag value was breaking
data-dir lookup when running wrapped commands.

Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit ff5c633)
Signed-off-by: Brad Davidson <[email protected]>
Signed-off-by: Brad Davidson <[email protected]>
(cherry picked from commit 9c32f83)
Signed-off-by: Brad Davidson <[email protected]>
@brandond brandond force-pushed the 2024-11-backports_release-1.29 branch from ec495b8 to 3a7ffbf Compare November 6, 2024 19:54
Copy link

codecov bot commented Nov 6, 2024

Codecov Report

Attention: Patch coverage is 42.56757% with 85 lines in your changes missing coverage. Please review.

Project coverage is 38.48%. Comparing base (0089811) to head (3a7ffbf).
Report is 9 commits behind head on release-1.29.

Files with missing lines Patch % Lines
pkg/etcd/etcd.go 48.05% 32 Missing and 8 partials ⚠️
pkg/etcd/resolver.go 45.83% 23 Missing and 3 partials ⚠️
pkg/configfilearg/defaultparser.go 0.00% 18 Missing ⚠️
pkg/etcd/snapshot.go 0.00% 1 Missing ⚠️

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

HEAD has 2 uploads less than BASE
Flag BASE (0089811) HEAD (3a7ffbf)
unittests 1 0
e2etests 7 6
Additional details and impacted files
@@               Coverage Diff                @@
##           release-1.29   #11263      +/-   ##
================================================
- Coverage         46.19%   38.48%   -7.71%     
================================================
  Files               178      162      -16     
  Lines             18618    17954     -664     
================================================
- Hits               8601     6910    -1691     
- Misses             8694     9852    +1158     
+ Partials           1323     1192     -131     
Flag Coverage Δ
e2etests 34.36% <2.70%> (-7.46%) ⬇️
inttests 34.76% <42.56%> (+0.07%) ⬆️
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 74ff74f into k3s-io:release-1.29 Nov 6, 2024
30 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