sync.go: add syncUpgradeableStatus() call when master pool not leveled
Upgradeable = false when required pool not leveled, even though in this instance
the upgrade is blocked from completing. Adds clarity for user experience.
@@ -611,6 +611,10 @@ func (optr *Operator) syncRequiredMachineConfigPools(_ *renderConfig) error {
if err := isMachineConfigPoolConfigurationValid(pool, version.Hash, optr.mcLister.Get); err != nil {
lastErr = fmt.Errorf("pool %s has not progressed to latest configuration: %v, retrying", pool.Name, err)
glog.Info(lastErr.Error())
+ syncerr := optr.syncUpgradeableStatus()
+ if syncerr != nil {
+ glog.Errorf("Error syncingUpgradeableStatus: %q", syncerr)
+ }
return false, nil
}
@@ -621,6 +625,10 @@ func (optr *Operator) syncRequiredMachineConfigPools(_ *renderConfig) error {
}
lastErr = fmt.Errorf("error required pool %s is not ready, retrying. Status: (total: %d, ready %d, updated: %d, unavailable: %d, degraded: %d)", pool.Name, pool.Status.MachineCount, pool.Status.ReadyMachineCount, pool.Status.UpdatedMachineCount, pool.Status.UnavailableMachineCount, pool.Status.DegradedMachineCount)
glog.Info(lastErr.Error())
+ syncerr := optr.syncUpgradeableStatus()
+ if syncerr != nil {
+ glog.Errorf("Error syncingUpgradeableStatus: %q", syncerr)
+ }
return false, nil
}
}
