chore(bors): merge pull request #622

622: Cherry-pick #621 r=tiagolobocastro a=tiagolobocastro fix(cordon-drain): return correct updated spec Outdated spec was being returned as part of the cordon/drain operations. Co-authored-by: Tiago Castro <[email protected]>
openebs · Jul 5, 2023 · 7ec0bad · 7ec0bad
2 parents 5ec7437 + d832339
commit 7ec0bad
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/control-plane/agents/src/bin/core/node/operations.rs b/control-plane/agents/src/bin/core/node/operations.rs
@@ -28,8 +28,8 @@ impl ResourceCordon for OperationGuardArc<NodeSpec> {
             .start_update(registry, &cloned_node_spec, NodeOperation::Cordon(label))
             .await?;
 
-        self.complete_update(registry, Ok(self.as_ref().clone()), spec_clone)
-            .await
+        self.complete_update(registry, Ok(()), spec_clone).await?;
+        Ok(self.as_ref().clone())
     }
 
     /// Uncordon a node via operation guard functions.
@@ -43,8 +43,8 @@ impl ResourceCordon for OperationGuardArc<NodeSpec> {
             .start_update(registry, &cloned_node_spec, NodeOperation::Uncordon(label))
             .await?;
 
-        self.complete_update(registry, Ok(self.as_ref().clone()), spec_clone)
-            .await
+        self.complete_update(registry, Ok(()), spec_clone).await?;
+        Ok(self.as_ref().clone())
     }
 }