move changes in another pr

kobzonega · kobzonega · commit 0a41cb4b331a · 2025-01-27T13:33:46.000+08:00
diff --git a/internal/controllers/database/sync.go b/internal/controllers/database/sync.go
@@ -369,8 +369,8 @@ func (r *Reconciler) waitForStatefulSetToScale(
 
 func shouldIgnoreDatabaseChange(database *resources.DatabaseBuilder) resources.IgnoreChangesFunction {
 	return func(oldObj, newObj runtime.Object) bool {
-		if statefulSet, ok := oldObj.(*appsv1.StatefulSet); ok {
-			if database.Spec.Pause && *statefulSet.Spec.Replicas == 0 {
+		if _, ok := newObj.(*appsv1.StatefulSet); ok {
+			if database.Spec.Pause && *oldObj.(*appsv1.StatefulSet).Spec.Replicas == 0 {
 				return true
 			}
 		}
diff --git 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
@@ -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)
 		}
 
diff --git a/internal/controllers/storage/sync.go b/internal/controllers/storage/sync.go
@@ -300,8 +300,8 @@ func (r *Reconciler) waitForNodeSetsToProvisioned(
 
 func shouldIgnoreStorageChange(storage *resources.StorageClusterBuilder) resources.IgnoreChangesFunction {
 	return func(oldObj, newObj runtime.Object) bool {
-		if statefulSet, ok := oldObj.(*appsv1.StatefulSet); ok {
-			if storage.Spec.Pause && *statefulSet.Spec.Replicas == 0 {
+		if _, ok := newObj.(*appsv1.StatefulSet); ok {
+			if storage.Spec.Pause && *oldObj.(*appsv1.StatefulSet).Spec.Replicas == 0 {
 				return true
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -369,8 +369,8 @@ func (r *Reconciler) waitForStatefulSetToScale(`
`369`	`369`
`370`	`370`	`func shouldIgnoreDatabaseChange(database *resources.DatabaseBuilder) resources.IgnoreChangesFunction {`
`371`	`371`	`return func(oldObj, newObj runtime.Object) bool {`
`372`		`- if statefulSet, ok := oldObj.(*appsv1.StatefulSet); ok {`
`373`		`- if database.Spec.Pause && *statefulSet.Spec.Replicas == 0 {`
	`372`	`+ if _, ok := newObj.(*appsv1.StatefulSet); ok {`
	`373`	`+ if database.Spec.Pause && oldObj.(appsv1.StatefulSet).Spec.Replicas == 0 {`
`374`	`374`	`return true`
`375`	`375`	`}`
`376`	`376`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ func (r *Reconciler) syncRemoteObjects(`
`60`	`60`	`for _, remoteObj := range remoteObjects {`
`61`	`61`	`remoteObjName := remoteObj.GetName()`
`62`	`62`	`remoteObjKind := remoteObj.GetObjectKind().GroupVersionKind().Kind`
	`63`	`+ remoteObjRV := remoteObj.GetResourceVersion()`
`63`	`64`	`var remoteResource *v1alpha1.RemoteResource`
`64`	`65`	`for idx := range remoteDatabaseNodeSet.Status.RemoteResources {`
`65`	`66`	`if resources.EqualRemoteResourceWithObject(&remoteDatabaseNodeSet.Status.RemoteResources[idx], remoteObj) {`
`@@ -102,11 +103,11 @@ func (r *Reconciler) syncRemoteObjects(`
`102`	`103`	`fmt.Sprintf("Failed to get resource %s with name %s: %s", remoteObjKind, remoteObjName, remoteGetErr),`
`103`	`104`	`)`
`104`	`105`	`}`
`105`		`- return Stop, ctrl.Result{RequeueAfter: DefaultRequeueDelay}, remoteGetErr`
	`106`	`+ remoteDatabaseNodeSet.UpdateRemoteResourceStatus(remoteResource, metav1.ConditionFalse, remoteObjRV)`
	`107`	`+ return r.updateStatusRemoteObjects(ctx, remoteDatabaseNodeSet, DefaultRequeueDelay)`
`106`	`108`	`}`
`107`	`109`
`108`	`110`	`// Check object existence in local cluster`
`109`		`- remoteObjRV := remoteObj.GetResourceVersion()`
`110`	`111`	`localObj := resources.CreateResource(remoteObj)`
`111`	`112`	`getErr := r.Client.Get(ctx, types.NamespacedName{`
`112`	`113`	`Name: localObj.GetName(),`
`@@ -144,7 +145,7 @@ func (r *Reconciler) syncRemoteObjects(`
`144`	`145`	`"Provisioning",`
`145`	`146`	`fmt.Sprintf("RemoteSync CREATE resource %s with name %s", remoteObjKind, remoteObjName),`
`146`	`147`	`)`
`147`		`- remoteDatabaseNodeSet.UpdateRemoteResourceStatus(remoteResource, metav1.ConditionTrue, remoteObjRV)`
	`148`	`+ remoteDatabaseNodeSet.UpdateRemoteResourceStatus(remoteResource, metav1.ConditionFalse, remoteObjRV)`
`148`	`149`	`return r.updateStatusRemoteObjects(ctx, remoteDatabaseNodeSet, StatusUpdateRequeueDelay)`
`149`	`150`	`}`
`150`	`151`
Original file line number	Diff line number	Diff line change
`@@ -300,8 +300,8 @@ func (r *Reconciler) waitForNodeSetsToProvisioned(`
`300`	`300`
`301`	`301`	`func shouldIgnoreStorageChange(storage *resources.StorageClusterBuilder) resources.IgnoreChangesFunction {`
`302`	`302`	`return func(oldObj, newObj runtime.Object) bool {`
`303`		`- if statefulSet, ok := oldObj.(*appsv1.StatefulSet); ok {`
`304`		`- if storage.Spec.Pause && *statefulSet.Spec.Replicas == 0 {`
	`303`	`+ if _, ok := newObj.(*appsv1.StatefulSet); ok {`
	`304`	`+ if storage.Spec.Pause && oldObj.(appsv1.StatefulSet).Spec.Replicas == 0 {`
`305`	`305`	`return true`
`306`	`306`	`}`
`307`	`307`	`}`