From 16e8f1bd38683000f1e6d84111c7a9fe313ba8bf Mon Sep 17 00:00:00 2001 From: Aleksei Kobzev Date: Mon, 27 Jan 2025 13:25:33 +0800 Subject: [PATCH] move changes in another pr --- .../controllers/remotedatabasenodeset/remote_objects.go | 7 ++++--- .../controllers/remotestoragenodeset/remote_objects.go | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/internal/controllers/remotedatabasenodeset/remote_objects.go b/internal/controllers/remotedatabasenodeset/remote_objects.go index 8b1305d5..d600e93d 100644 --- a/internal/controllers/remotedatabasenodeset/remote_objects.go +++ b/internal/controllers/remotedatabasenodeset/remote_objects.go @@ -60,6 +60,7 @@ 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) { @@ -102,11 +103,11 @@ func (r *Reconciler) syncRemoteObjects( fmt.Sprintf("Failed to get resource %s with name %s: %s", remoteObjKind, remoteObjName, remoteGetErr), ) } - return Stop, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, remoteGetErr + remoteDatabaseNodeSet.UpdateRemoteResourceStatus(remoteResource, metav1.ConditionFalse, remoteObjRV) + return r.updateStatusRemoteObjects(ctx, remoteDatabaseNodeSet, DefaultRequeueDelay) } // Check object existence in local cluster - remoteObjRV := remoteObj.GetResourceVersion() localObj := resources.CreateResource(remoteObj) getErr := r.Client.Get(ctx, types.NamespacedName{ Name: localObj.GetName(), @@ -144,7 +145,7 @@ func (r *Reconciler) syncRemoteObjects( "Provisioning", fmt.Sprintf("RemoteSync CREATE resource %s with name %s", remoteObjKind, remoteObjName), ) - remoteDatabaseNodeSet.UpdateRemoteResourceStatus(remoteResource, metav1.ConditionTrue, remoteObjRV) + remoteDatabaseNodeSet.UpdateRemoteResourceStatus(remoteResource, metav1.ConditionFalse, remoteObjRV) return r.updateStatusRemoteObjects(ctx, remoteDatabaseNodeSet, StatusUpdateRequeueDelay) } diff --git a/internal/controllers/remotestoragenodeset/remote_objects.go b/internal/controllers/remotestoragenodeset/remote_objects.go index 4f8c670f..a54f6a39 100644 --- a/internal/controllers/remotestoragenodeset/remote_objects.go +++ b/internal/controllers/remotestoragenodeset/remote_objects.go @@ -60,6 +60,7 @@ 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) { @@ -102,11 +103,11 @@ func (r *Reconciler) syncRemoteObjects( fmt.Sprintf("Failed to get resource %s with name %s: %s", remoteObjKind, remoteObjName, remoteGetErr), ) } - return Stop, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, remoteGetErr + remoteStorageNodeSet.UpdateRemoteResourceStatus(remoteResource, metav1.ConditionFalse, remoteObjRV) + return r.updateStatusRemoteObjects(ctx, remoteStorageNodeSet, DefaultRequeueDelay) } // Check object existence in local cluster - remoteObjRV := remoteObj.GetResourceVersion() localObj := resources.CreateResource(remoteObj) getErr := r.Client.Get(ctx, types.NamespacedName{ Name: localObj.GetName(), @@ -144,7 +145,7 @@ func (r *Reconciler) syncRemoteObjects( "Provisioning", fmt.Sprintf("RemoteSync CREATE resource %s with name %s", remoteObjKind, remoteObjName), ) - remoteStorageNodeSet.UpdateRemoteResourceStatus(remoteResource, metav1.ConditionTrue, remoteObjRV) + remoteStorageNodeSet.UpdateRemoteResourceStatus(remoteResource, metav1.ConditionFalse, remoteObjRV) return r.updateStatusRemoteObjects(ctx, remoteStorageNodeSet, StatusUpdateRequeueDelay) }