move changes in another pr

ydb-platform · Jan 27, 2025 · 194dc1b · 194dc1b
1 parent 455a884
commit 194dc1b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 17 deletions.
diff --git a/internal/controllers/database/sync.go b/internal/controllers/database/sync.go
@@ -369,15 +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 {
-				return true
-			}
-		}
-
-		if sec, ok := oldObj.(*corev1.Secret); ok {
-			// Do not update already existing secret data for encryption
-			if (len(sec.StringData) > 0) || (len(sec.Data) > 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
 			}
 		}