Skip to content

Conversation

@k0da
Copy link
Contributor

@k0da k0da commented Oct 17, 2025

This commit adds RKE2ControlPlane.spec.serverConfig.secretsEncryption property.

This allows to specify provider type (aescbc or secretbox) and load encryption key from a secret.

kind/feature

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

Checklist:

  • squashed commits into logical changes
  • includes documentation
  • adds unit tests
  • adds or updates e2e tests

@k0da k0da force-pushed the secretsatrest branch 5 times, most recently from 099d4e2 to 44689c8 Compare October 20, 2025 20:52
@k0da
Copy link
Contributor Author

k0da commented Oct 20, 2025

E2E tested it:

RKE2ControlPlane part:

      secretsEncryption:
          encryptionKeySecret:
            name: enc-secret
            namespace: xyz-nonprod-4t9jm
          provider: secretbox
# rke2 secrets-encrypt status
Encryption Status: Enabled
Current Rotation Stage: start
Server Encryption Hashes: All hashes match

Active  Key Type           Name
------  --------           ----
 *      XSalsa20-POLY1305  enckey

@k0da k0da marked this pull request as ready for review October 20, 2025 22:25
@k0da k0da requested a review from a team as a code owner October 20, 2025 22:25
@k0da k0da force-pushed the secretsatrest branch 3 times, most recently from 6f7ac8b to 3d1d6d4 Compare October 21, 2025 09:03
@furkatgofurov7
Copy link
Contributor

@k0da thanks for PR, can you take a look at failing tests and fix them?

@k0da
Copy link
Contributor Author

k0da commented Oct 21, 2025

@k0da thanks for PR, can you take a look at failing tests and fix them?

I fixed v1alpha1 conversion and run tests locally, they passed now.

@k0da k0da requested a review from anmazzotti October 22, 2025 15:58
anmazzotti
anmazzotti previously approved these changes Oct 23, 2025
Copy link
Contributor

@anmazzotti anmazzotti left a comment

Choose a reason for hiding this comment

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

Thank you for adding the documentation.

@furkatgofurov7 furkatgofurov7 added this pull request to the merge queue Oct 23, 2025
@furkatgofurov7 furkatgofurov7 changed the title RKE2ControlPlane: v1beta1 support EncryptionConfig ✨ Add EncryptionConfig support to RKE2ControlPlane Oct 23, 2025
@furkatgofurov7 furkatgofurov7 removed this pull request from the merge queue due to a manual request Oct 23, 2025
This commit adds RKE2ControlPlane.spec.serverConfig.secretsEncryption property.

This allows to specify provider type (aescbc or secretbox) and load encryption key
from a secret.

Signed-off-by: Dinar Valeev <[email protected]>
@k0da k0da requested a review from anmazzotti October 23, 2025 13:54
Copy link
Contributor

@furkatgofurov7 furkatgofurov7 left a comment

Choose a reason for hiding this comment

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

@k0da thank you for working on this!

@furkatgofurov7 furkatgofurov7 added this pull request to the merge queue Oct 23, 2025
@furkatgofurov7 furkatgofurov7 added area/controlplane Indicates an issue or PR related to the control plane provider kind/feature labels Oct 23, 2025
Merged via the queue into rancher:main with commit a1f5488 Oct 23, 2025
5 checks passed
@github-project-automation github-project-automation bot moved this from PR to be reviewed to Done in CAPI / Turtles Oct 23, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/controlplane Indicates an issue or PR related to the control plane provider kind/feature

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants