Add PSA configuration secret to provisioning resource set#667
Merged
jbiers merged 1 commit intorancher:mainfrom Feb 20, 2025
Merged
Add PSA configuration secret to provisioning resource set#667jbiers merged 1 commit intorancher:mainfrom
jbiers merged 1 commit intorancher:mainfrom
Conversation
pedromfcarvalho
commented
Feb 14, 2025
jbiers
previously approved these changes
Feb 14, 2025
Contributor
jbiers
left a comment
There was a problem hiding this comment.
LGTM. Just for context, the default resourceSet will stop receiving any updates and be treated as deprecated once rancher/dashboard#12997 is completed. This is part of a larger effort described in #607.
snasovich
previously approved these changes
Feb 18, 2025
When a k3s/RKE2 cluster is created with a non-default PSA configuration template, the configuration from that template is then stored in a secret, which is used by the control plane planner. This secret is only updated by the webhook when the provisioning cluster object is updated, and it wasn't included in the backups created from the default resource set, so after a migration the planner would get stuck in an error state until the secret was re-created manually.
4a35b5e
0f5546d to
4a35b5e
Compare
Contributor
Author
|
Rebased because of a merge conflict. |
Member
|
/backport release/v6.x |
|
Not creating port PR, there was an error running git am -3: |
jbiers
approved these changes
Feb 20, 2025
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
When a k3s/RKE2 cluster is created with a non-default PSA configuration template, the configuration from that template is then stored in a secret, which is used by the control plane planner.
This secret is only updated by the webhook when the provisioning cluster object is updated, and it wasn't included in the backups created from the default resource set, so after a migration the planner would get stuck in an error state until the secret was re-created manually.
The secret name is defined in the webhook here.
This is not needed for RKE1 because in that case the configuration from the template is added to the management v3 cluster object, which is already backed-up, and not a secret.
Issue: rancher/rancher#48884
QA Suggestions
Suggested steps:
<downstream-cluster-name>-admission-configuration-psact(in thefleet-defaultnamespace.rancher-resource-set.resourceSetName, valuesrancher-resource-set-fullandrancher-resource-set).admission-configuration-psactsecret is present.rancher/chartsrepo.[1]
