RBD: Fix encrypted restore with different kms config (backport #2546) #2555
Conversation
This file contains 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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
During PVC snapshot/clone both kms config and passphrase needs to copied, while for PVC restore only passphrase needs to be copied to dest rbdvol since destination storageclass may have another kms config. Signed-off-by: Rakshith R <rar@redhat.com> (cherry picked from commit 59b7a26)
Signed-off-by: Rakshith R <rar@redhat.com> (cherry picked from commit f63ed2c)
Signed-off-by: Rakshith R <rar@redhat.com> (cherry picked from commit dac4e76)
Currently only kubectlCreate arg is used with retryKubectlArgs(), But it maybe used later on. Signed-off-by: Rakshith R <rar@redhat.com> (cherry picked from commit b471cac)
This commit adds bugfix to copy encryption passphrase for thick provisioned PVC restored from snapshot. Signed-off-by: Rakshith R <rar@redhat.com> (cherry picked from commit ded75eb)
Signed-off-by: Rakshith R <rar@redhat.com> (cherry picked from commit f60b097)
Madhu-1
approved these changes
Oct 5, 2021
|
/retest ci/centos/mini-e2e-helm/k8s-1.22 |
|
Note that ci/centos/k8s-e2e-external-storage jobs should not require passing for backports, no need to rerun them/ |
Rakshith-R
approved these changes
Oct 5, 2021
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.
This is an automatic backport of pull request #2546 done by Mergify.
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.io/