Add support for secretbox encryption provider with the k3s secrets-encrypt command
#12021
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dereknola
force-pushed
the
secret_box_static
branch
from
673ae7d to
9977593
Compare
brandond
requested changes
Mar 27, 2025
Member
brandond
left a comment
brandond
left a comment
There was a problem hiding this comment.
We're allowing users to select the provider, not the key type. Lets use the same language as the upstream docs to avoid confusion.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #12021 +/- ##
==========================================
- Coverage 45.89% 44.72% -1.18%
==========================================
Files 188 188
Lines 19068 19190 +122
==========================================
- Hits 8752 8582 -170
- Misses 9032 9361 +329
+ Partials 1284 1247 -37
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
dereknola
force-pushed
the
secret_box_static
branch
from
9977593 to
875d606
Compare
brandond
reviewed
Mar 28, 2025
brandond
previously approved these changes
Mar 28, 2025
- Add testlet for new provider switch - Handle migration between providers - Add exception for criticalcontrolargs Signed-off-by: Derek Nola <derek.nola@suse.com>
Signed-off-by: Derek Nola <derek.nola@suse.com>
Signed-off-by: Derek Nola <derek.nola@suse.com>
Signed-off-by: Derek Nola <derek.nola@suse.com>
dereknola
force-pushed
the
secret_box_static
branch
from
875d606 to
2003460
Compare
brandond
reviewed
Apr 2, 2025
| return err | ||
| } | ||
| if control.EncryptProvider == secretsencrypt.SecretBoxProvider { | ||
| return fmt.Errorf("rotate does not support secretbox key type, use rotate-keys instead") |
Member
There was a problem hiding this comment.
is this something we need to cover in the docs?
Member
Author
There was a problem hiding this comment.
Yeah this will be mentioned when this gets added to docs.
brandond
approved these changes
Apr 2, 2025
vitorsavian
approved these changes
Apr 3, 2025
This was referenced Apr 7, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed Changes
secrets-encryption-providerwith valuse ofaescbc(default and original) andsecretbox.k3s secrets-encrypt rotate-keyscommand. Not supported on the older (eventually will be deprecated)preparerotateandreencryptsubcommands.Types of Changes
New Feature
Verification
Manually tested through various configurations:
NEW CLUSTER:
secrets-encryption: trueandsecrets-encryption-provider: secretboxto the config.yamlk3s secrets-encrypt statusyou will see a newXSalsa20-POLY1305type as the active keyMIGRATING CLUSTER
secrets-encryption-provider: secretboxto the config.yaml.secrets-encryptionshould already be therek3s secrets-encrypt rotate-keyson a single serverXSalsa20-POLY1305type as the active keyTesting
Covered by new testlet in docker tests
Linked Issues
#12222
User-Facing Change
Further Comments