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

Add --output/-o to secrets-encrypt status #2681

Merged
merged 1 commit into from Apr 8, 2022

Conversation

jakefhyde
Copy link
Contributor

Proposed Changes

Add secrets-encrypt status -o/--output.

Given that the k3s docs were not updated for this change (and I couldn't find any open associated issues or PRs), I don't believe so

Types of Changes

Add cli flag

Verification

Can be verified the same was as it was for k3s: k3s-io/k3s#5138 (comment). I verified it myself by provisioning a cluster with rke2 version v1.23.4+rke2r2:

root@jhyde-rke2-test-pool1-444c534f-rc96x:/tmp# ./rke2-test secrets-encrypt status
Encryption Status: Enabled
Current Rotation Stage: start
Server Encryption Hashes: All hashes match

Active  Key Type  Name
------  --------  ----
 *      AES-CBC   aescbckey

root@jhyde-rke2-test-pool1-444c534f-rc96x:/tmp# ./rke2-test secrets-encrypt status -o json
{
        "stage": "start",
        "activekey": "aescbckey",
        "enable": true,
        "hashmatch": true
}

Linked Issues

#2680

Further Comments

I'd considered exposing the flag from k3s in the event that k3s supports different formats at some point, but the overhead for creating PRs for rke2 in that case to update the help text would be extremely low anyways.

@jakefhyde jakefhyde requested a review from a team as a code owner March 25, 2022 15:50
@dereknola dereknola merged commit e00ab26 into rancher:master Apr 8, 2022
dereknola pushed a commit to dereknola/rke2 that referenced this pull request Apr 20, 2022
dereknola pushed a commit to dereknola/rke2 that referenced this pull request Apr 20, 2022
dereknola added a commit that referenced this pull request Apr 20, 2022
* Add --output/-o to secrets-encrypt status (#2681)

* Hide overridden secrets-encryption flag (#2722)

Signed-off-by: Derek Nola <derek.nola@suse.com>

Co-authored-by: Jake Hyde <33796120+jakefhyde@users.noreply.github.com>
dereknola added a commit that referenced this pull request Apr 20, 2022
* Add --output/-o to secrets-encrypt status (#2681)

* Hide overridden secrets-encryption flag (#2722)

Signed-off-by: Derek Nola <derek.nola@suse.com>

Co-authored-by: Jake Hyde <33796120+jakefhyde@users.noreply.github.com>
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.

None yet

3 participants