Volumes in recipes should be used to override LabelSelector and ignored for velero backups #1739
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
Member
raghavendra-talur
commented
Jan 7, 2025
•
raghavendra-talur
commented
- Removed function pointer that changed behavior of the recipeVolumesAndOptionallyWorkflowsGet()
- RecipeElementsGet always returns complete recipe data
- Ignore volume group in a workflow sequence
- Fix tests
asn1809
reviewed
Jan 8, 2025
| @@ -141,15 +132,19 @@ func recipeVolumesAndOptionallyWorkflowsGet(ctx context.Context, reader client.R | |||
| recipe.Spec.Volumes.LabelSelector) | |||
| } | |||
|
|
|||
| *recipeElements = RecipeElements{ | |||
| recipeElements = RecipeElements{ | |||
There was a problem hiding this comment.
Should pvcSelector be added with a OR logic between selector defined in drpc and recipe?
There was a problem hiding this comment.
The expectation is that recipe overrides everything that is defined in the drpc.
Co-Authored-by: Annaraya Narasagond <[email protected]> Signed-off-by: Raghavendra Talur <[email protected]>
Co-Authored-by: Annaraya Narasagond <[email protected]> Signed-off-by: Raghavendra Talur <[email protected]>
Co-Authored-by: Annaraya Narasagond <[email protected]> Signed-off-by: Raghavendra Talur <[email protected]>
raghavendra-talur
force-pushed
the
rtalur-fix-volumes-in-recipes
branch
from
15251f0 to
176e120
Compare
raghavendra-talur
changed the title
BenamarMk
reviewed
Jan 10, 2025
| var recipeElements RecipeElements | ||
| recipeElements, err := RecipeElementsGet(ctx, reader, vrg, ramenConfig, log) | ||
| if err != nil { | ||
| return recipeElements.PvcSelector, err |
There was a problem hiding this comment.
(nit) This line is a bit confusing. It references returning recipeElements.PvcSelector on an error, but since filterPVC() skips PvcSelector in case of an error, I suggest returning PvcSelector{} instead. This would improve readability.
There was a problem hiding this comment.
I merged this PR and fixed this nit in the next PR #1738
BenamarMk
approved these changes
Jan 10, 2025
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.