Skip to content

Commit d37eebc

Browse files
committed
kata installation should not watch the 'worker' MCP state
When the MCO migrates nodes between pools, the target pool enters the Updating state and has nodes gradually added to it as they are updated and rebooted while the source pool is drained by simply setting its machine count to the desired value at once and never leaves the Updated state. Because the "worker" pool is the source pool in kata installation, it follows that nothing can be gained by watching its status. Normally it doesn't hurt either but if "worker" is Updating already for some unrelated reason when kata installation is starting, it throws off the isInstallationInProgress detection and thus the whole installation flow. Signed-off-by: Pavel Mores <[email protected]>
1 parent e0340d9 commit d37eebc

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

controllers/openshift_controller.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1267,7 +1267,7 @@ func (r *KataConfigOpenShiftReconciler) processKataConfigInstallRequest() (ctrl.
12671267
r.setInProgressConditionToInstalling()
12681268
}
12691269

1270-
isInstallationInProgress := r.isMcpUpdating(machinePool) || (!isConvergedCluster && r.isMcpUpdating("worker"))
1270+
isInstallationInProgress := r.isMcpUpdating(machinePool)
12711271

12721272
// Create kata-oc MCP only if it's not a converged cluster
12731273
if !isConvergedCluster {
@@ -1318,11 +1318,6 @@ func (r *KataConfigOpenShiftReconciler) processKataConfigInstallRequest() (ctrl.
13181318
r.Log.Info("MCP updating state", "MCP name", machinePool, "is updating", isKataMcpUpdating)
13191319

13201320
isMcoUpdating := isKataMcpUpdating
1321-
if !isConvergedCluster {
1322-
isWorkerUpdating := r.isMcpUpdating("worker")
1323-
r.Log.Info("MCP updating state", "MCP name", "worker", "is updating", isWorkerUpdating)
1324-
isMcoUpdating = isKataMcpUpdating || isWorkerUpdating
1325-
}
13261321

13271322
if isMcoUpdating && r.getInProgressConditionValue() == corev1.ConditionFalse {
13281323
r.setInProgressConditionToUpdating()

0 commit comments

Comments
 (0)