Merge pull request #13735 from openshift-cherrypick-robot/cherry-pick-13717-to-release-4.15

[release-4.15] OCPBUGS-31839: fix bug where paused MCPs were incorrectly unpausing w…

Author: openshift-merge-bot[bot]

frontend/public/components/modals/cluster-update-modal.tsx

@@ -124,20 +124,18 @@ const ClusterUpdateModal = withHandlePromise((props: ClusterUpdateModalProps) =>
 
     // Clear any previous error message.
     setError('');
-    let MCPsToResumePromises;
     let MCPsToPausePromises;
+    let MCPsToResumePromises;
     if (upgradeType === upgradeTypes.Full) {
-      MCPsToResumePromises = getMCPsToPausePromises(pausedMCPs, false);
       MCPsToPausePromises = [];
+      MCPsToResumePromises = getMCPsToPausePromises(pausedMCPs, false);
     } else {
-      const MCPsToResume = pausedMCPs.filter((mcp) =>
-        machineConfigPoolsToPause.find((m) => m !== mcp.metadata.name),
-      );
       const MCPsToPause = pauseableMCPs.filter((mcp) =>
         machineConfigPoolsToPause.find((m) => m === mcp.metadata.name),
       );
-      MCPsToResumePromises = getMCPsToPausePromises(MCPsToResume, false);
+      const MCPsToResume = pauseableMCPs.filter((mcp) => !MCPsToPause.includes(mcp));
       MCPsToPausePromises = getMCPsToPausePromises(MCPsToPause, true);
+      MCPsToResumePromises = getMCPsToPausePromises(MCPsToResume, false);
     }
     const patch = [
       {