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

Readd k3s secrets-encrypt rotate-keys with correct support for KMSv2 GA #9340

Merged
merged 9 commits into from
Feb 9, 2024

Conversation

dereknola
Copy link
Member

Proposed Changes

  • Uses the new automatic reload metrics to correctly wait for apiserver reloading
  • Resolve bugs around using the rotate-keys and disable commands on non etcd-leader nodes

Types of Changes

Feature "Fix"

Verification

go test ./tests/e2e/secretsencryption/secretsencryption_test.go

Testing

Reenabled the E2E test for this feature.

Linked Issues

#9080

User-Facing Change


Further Comments

Signed-off-by: Derek Nola <[email protected]>
@dereknola dereknola requested a review from a team as a code owner February 1, 2024 20:16
COPY ./tests ./tests
COPY ./.git ./.git
COPY ./pkg ./pkg
Copy link
Member Author

@dereknola dereknola Feb 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a docker caching optimization, as the COPY ./tests ./tests line will now be cached most of the time. COPY ./.git ./.git is now sometimes cached, just less so.

Copy link

codecov bot commented Feb 2, 2024

Codecov Report

Attention: 98 lines in your changes are missing coverage. Please review.

Comparison is base (d8907ce) 40.53% compared to head (0befa7e) 27.79%.
Report is 25 commits behind head on master.

Files Patch % Lines
pkg/secretsencrypt/config.go 0.00% 61 Missing ⚠️
pkg/server/secrets-encrypt.go 0.00% 10 Missing ⚠️
pkg/daemons/control/server.go 0.00% 9 Missing ⚠️
pkg/secretsencrypt/controller.go 0.00% 9 Missing ⚠️
pkg/clientaccess/token.go 53.84% 5 Missing and 1 partial ⚠️
pkg/cli/secretsencrypt/secrets_encrypt.go 0.00% 2 Missing ⚠️
pkg/daemons/control/deps/deps.go 0.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           master    #9340       +/-   ##
===========================================
- Coverage   40.53%   27.79%   -12.74%     
===========================================
  Files         154      154               
  Lines       16555    13498     -3057     
===========================================
- Hits         6710     3752     -2958     
- Misses       8697     8958      +261     
+ Partials     1148      788      -360     
Flag Coverage Δ
inttests 22.43% <11.71%> (-15.26%) ⬇️
unittests 15.86% <25.00%> (+1.33%) ⬆️

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.

pkg/clientaccess/token.go Outdated Show resolved Hide resolved
pkg/clientaccess/token.go Show resolved Hide resolved
pkg/secretsencrypt/controller.go Outdated Show resolved Hide resolved
pkg/clientaccess/token.go Outdated Show resolved Hide resolved
Signed-off-by: Derek Nola <[email protected]>
pkg/secretsencrypt/config.go Outdated Show resolved Hide resolved
pkg/secretsencrypt/config.go Outdated Show resolved Hide resolved
pkg/secretsencrypt/config.go Outdated Show resolved Hide resolved
Signed-off-by: Derek Nola <[email protected]>
pkg/clientaccess/token.go Outdated Show resolved Hide resolved
pkg/clientaccess/token.go Outdated Show resolved Hide resolved
pkg/clientaccess/token.go Outdated Show resolved Hide resolved
pkg/clientaccess/token.go Outdated Show resolved Hide resolved
brandond
brandond previously approved these changes Feb 8, 2024
Copy link
Member

@brandond brandond left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couple nits on comments/whitespace but LGTM otherwise

Signed-off-by: Derek Nola <[email protected]>
@dereknola dereknola merged commit fa11850 into k3s-io:master Feb 9, 2024
15 checks passed
@dereknola dereknola deleted the 129_se_metrics branch February 9, 2024 19:37
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.

3 participants