vrg: Add Kube object restore condition #1758
Merged
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
nirs
reviewed
Jan 23, 2025
internal/controller/status.go
Outdated
| @@ -30,6 +30,10 @@ const ( | |||
| // after this condition is true. | |||
| VRGConditionTypeClusterDataReady = "ClusterDataReady" | |||
|
|
|||
| // K8s objects are ready. This condition is used to indicate that all the | |||
| // K8s objects required for the app to be active in the cluster are ready. | |||
| VRGConditionTypeK8sObjectsReady = "K8sObjectsReady" | |||
There was a problem hiding this comment.
So you want to add a new condition to show the status of the kube objects in addition of the pvcs/pvs restored by ramen?
It makes sense for #1729 but K8sObjectsReady does not match the terms we use. How about "KubeObjectsReady" matching "KubeObjectsSelector"?
raghavendra-talur
force-pushed
the
rtalur-pv-k8s-sequence
branch
from
18d738b to
90f57cd
Compare
raghavendra-talur
force-pushed
the
rtalur-pv-k8s-sequence
branch
4 times, most recently
from
3bb6a43 to
9dd9b60
Compare
Earlier, we used to restore kube objects along with PV and PVCs. However, with the introduction of hooks this is not correct. The hooks depend on the successful restoration of the PV and PVCs to succeed. There is a strict dependency in the order of operations and both cannot be performed in the same function call. We introduce a new condition to keep track of the restore status for Kube Objects. Once the pv and pvcs are restored then we proceed to the kube objects restoration. Co-Authored-by: Annaraya Narasagond <[email protected]> Signed-off-by: Raghavendra Talur <[email protected]>
raghavendra-talur
force-pushed
the
rtalur-pv-k8s-sequence
branch
from
9dd9b60 to
4eddb95
Compare
raghavendra-talur
changed the title
|
Fixes #1729 |
raghavendra-talur
requested review from
BenamarMk,
ShyamsundarR,
asn1809,
pruthvitd and
GowthamShanmugam
asn1809
reviewed
Jan 31, 2025
| @@ -1224,6 +1242,28 @@ func (v *VRGInstance) shouldRestoreClusterData() bool { | |||
| return true | |||
| } | |||
|
|
|||
| func (v *VRGInstance) shouldRestoreKubeObjects() bool { | |||
| KubeObjectsRestored := findCondition(v.instance.Status.Conditions, VRGConditionTypeKubeObjectsReady) | |||
There was a problem hiding this comment.
Should KubeObjectsRestored be renamed as kubeObjectsRestoredCond?
BenamarMk
reviewed
Jan 31, 2025
| func (v *VRGInstance) kubeObjectsRecover(result *ctrl.Result, s3ProfileName string) error { | ||
| if v.kubeObjectProtectionDisabled("recovery") { | ||
| return nil | ||
| func (v *VRGInstance) skipIfS3ProfileIsForTest() bool { |
There was a problem hiding this comment.
(nit) this function shouldn't belong in this file.
BenamarMk
approved these changes
Jan 31, 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.
Earlier, we used to restore kube objects along with PV and PVCs.
However, with the introduction of hooks this is not correct. The hooks depend on the successful restoration of the PV and PVCs to succeed. There is a strict dependency in the order of operations and both cannot be performed in the same function call.
We introduce a new condition to keep track of the restore status for Kube Objects. Once the pv and pvcs are restored then we proceed to the kube objects restoration.