Merge pull request #1256 from loft-sh/fix/node-syncer-not-requeuing

Fixed node-syncer not requeuing after status update
loft-sh · Sep 29, 2023 · c1b5595 · c1b5595
2 parents 7e7d9e4 + 7dd6b42
commit c1b5595
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/pkg/controllers/resources/nodes/syncer.go b/pkg/controllers/resources/nodes/syncer.go
@@ -245,8 +245,7 @@ func (s *nodeSyncer) Sync(ctx *synccontext.SyncContext, pObj client.Object, vObj
 			return ctrl.Result{}, err
 		}
 
-		// we will requeue here anyways
-		return ctrl.Result{}, nil
+		vNode = updatedVNode
 	}
 
 	updated := s.translateUpdateBackwards(pNode, vNode)

diff --git a/pkg/controllers/resources/nodes/syncer_test.go b/pkg/controllers/resources/nodes/syncer_test.go
@@ -335,6 +335,9 @@ func TestSync(t *testing.T) {
 	editedNode = &corev1.Node{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: baseName.Name,
+			Annotations: map[string]string{
+				translate.ManagedLabelsAnnotation: "test",
+			},
 			Labels: map[string]string{
 				"test": "true",
 			},
@@ -473,6 +476,9 @@ func TestSync(t *testing.T) {
 	editedNode = &corev1.Node{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: baseName.Name,
+			Annotations: map[string]string{
+				translate.ManagedLabelsAnnotation: "test",
+			},
 			Labels: map[string]string{
 				"test": "true",
 			},
@@ -517,6 +523,9 @@ func TestSync(t *testing.T) {
 	editedNode = &corev1.Node{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: baseName.Name,
+			Annotations: map[string]string{
+				translate.ManagedLabelsAnnotation: "test",
+			},
 			Labels: map[string]string{
 				"test": "true",
 			},