Skip to content

fix remoteObj revision field #232

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jan 27, 2025
Merged

fix remoteObj revision field #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c49f2f
fix remoteObj revision is status
kobzonega Dec 4, 2024
4156242
changie info
kobzonega Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changes/unreleased/Fixed-20250127-125607.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
kind: Fixed
body: fix field resourceVersion inside .status.remoteResources.conditions
time: 2025-01-27T12:56:07.577721+08:00
7 changes: 3 additions & 4 deletions internal/controllers/remotedatabasenodeset/remote_objects.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ func (r *Reconciler) syncRemoteObjects(
for _, remoteObj := range remoteObjects {
remoteObjName := remoteObj.GetName()
remoteObjKind := remoteObj.GetObjectKind().GroupVersionKind().Kind
remoteObjRV := remoteObj.GetResourceVersion()
var remoteResource *v1alpha1.RemoteResource
for idx := range remoteDatabaseNodeSet.Status.RemoteResources {
if resources.EqualRemoteResourceWithObject(&remoteDatabaseNodeSet.Status.RemoteResources[idx], remoteObj) {
Expand Down Expand Up @@ -103,11 +102,11 @@ func (r *Reconciler) syncRemoteObjects(
fmt.Sprintf("Failed to get resource %s with name %s: %s", remoteObjKind, remoteObjName, remoteGetErr),
)
}
remoteDatabaseNodeSet.UpdateRemoteResourceStatus(remoteResource, metav1.ConditionFalse, remoteObjRV)
return r.updateStatusRemoteObjects(ctx, remoteDatabaseNodeSet, DefaultRequeueDelay)
return Stop, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, remoteGetErr
}

// Check object existence in local cluster
remoteObjRV := remoteObj.GetResourceVersion()
localObj := resources.CreateResource(remoteObj)
getErr := r.Client.Get(ctx, types.NamespacedName{
Name: localObj.GetName(),
Expand Down Expand Up @@ -145,7 +144,7 @@ func (r *Reconciler) syncRemoteObjects(
"Provisioning",
fmt.Sprintf("RemoteSync CREATE resource %s with name %s", remoteObjKind, remoteObjName),
)
remoteDatabaseNodeSet.UpdateRemoteResourceStatus(remoteResource, metav1.ConditionFalse, remoteObjRV)
remoteDatabaseNodeSet.UpdateRemoteResourceStatus(remoteResource, metav1.ConditionTrue, remoteObjRV)
return r.updateStatusRemoteObjects(ctx, remoteDatabaseNodeSet, StatusUpdateRequeueDelay)
}

Expand Down
7 changes: 3 additions & 4 deletions internal/controllers/remotestoragenodeset/remote_objects.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ func (r *Reconciler) syncRemoteObjects(
for _, remoteObj := range remoteObjects {
remoteObjName := remoteObj.GetName()
remoteObjKind := remoteObj.GetObjectKind().GroupVersionKind().Kind
remoteObjRV := remoteObj.GetResourceVersion()
var remoteResource *v1alpha1.RemoteResource
for idx := range remoteStorageNodeSet.Status.RemoteResources {
if resources.EqualRemoteResourceWithObject(&remoteStorageNodeSet.Status.RemoteResources[idx], remoteObj) {
Expand Down Expand Up @@ -103,11 +102,11 @@ func (r *Reconciler) syncRemoteObjects(
fmt.Sprintf("Failed to get resource %s with name %s: %s", remoteObjKind, remoteObjName, remoteGetErr),
)
}
remoteStorageNodeSet.UpdateRemoteResourceStatus(remoteResource, metav1.ConditionFalse, remoteObjRV)
return r.updateStatusRemoteObjects(ctx, remoteStorageNodeSet, DefaultRequeueDelay)
return Stop, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, remoteGetErr
}

// Check object existence in local cluster
remoteObjRV := remoteObj.GetResourceVersion()
localObj := resources.CreateResource(remoteObj)
getErr := r.Client.Get(ctx, types.NamespacedName{
Name: localObj.GetName(),
Expand Down Expand Up @@ -145,7 +144,7 @@ func (r *Reconciler) syncRemoteObjects(
"Provisioning",
fmt.Sprintf("RemoteSync CREATE resource %s with name %s", remoteObjKind, remoteObjName),
)
remoteStorageNodeSet.UpdateRemoteResourceStatus(remoteResource, metav1.ConditionFalse, remoteObjRV)
remoteStorageNodeSet.UpdateRemoteResourceStatus(remoteResource, metav1.ConditionTrue, remoteObjRV)
return r.updateStatusRemoteObjects(ctx, remoteStorageNodeSet, StatusUpdateRequeueDelay)
}

Expand Down
Loading