Skip to content

Commit

Permalink
operator: remove excessive logging temporarily added for debugging
Browse files Browse the repository at this point in the history
  • Loading branch information
kikisdeliveryservice committed May 24, 2021
1 parent e46e92e commit e1203d4
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 11 deletions.
5 changes: 0 additions & 5 deletions pkg/operator/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -411,11 +411,6 @@ func isMachineConfigPoolConfigurationValid(pool *mcfgv1.MachineConfigPool, versi
if ok && v != version {
return fmt.Errorf("controller version mismatch for %s expected %s has %s: %v", mcName, version, v, machineConfigPoolStatus(pool))
}
if ok {
glog.Infof("pool %s references machine config %s at the expected %s", pool.GetName(), mcName, version)
} else {
glog.Infof("pool %s references machine config %s, which does not declare a version", pool.GetName(), mcName)
}
}
// all MCs were generated by correct controller, but osImageURL is not a source, so let's double check here
// to cover case where hashes match but there is an upgrade and avoid race where matching hashes pass before a new config is
Expand Down
6 changes: 0 additions & 6 deletions pkg/operator/sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -566,8 +566,6 @@ func (optr *Operator) syncMachineConfigServer(config *renderConfig) error {
// syncRequiredMachineConfigPools ensures that all the nodes in machineconfigpools labeled with requiredForUpgradeMachineConfigPoolLabelKey
// have updated to the latest configuration.
func (optr *Operator) syncRequiredMachineConfigPools(_ *renderConfig) error {
glog.Infof("syncing Required MachineConfigPools")

var lastErr error
if err := wait.Poll(time.Second, 10*time.Minute, func() (bool, error) {
if lastErr != nil {
Expand Down Expand Up @@ -615,7 +613,6 @@ func (optr *Operator) syncRequiredMachineConfigPools(_ *renderConfig) error {
}
if err := isMachineConfigPoolConfigurationValid(pool, version.Hash, opURL, 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)
Expand All @@ -625,19 +622,16 @@ func (optr *Operator) syncRequiredMachineConfigPools(_ *renderConfig) error {

if pool.Generation <= pool.Status.ObservedGeneration &&
isPoolStatusConditionTrue(pool, mcfgv1.MachineConfigPoolUpdated) {
glog.Infof("pool %s is up to date", pool.Name)
continue
}
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
}
}
glog.Info("required machine-config pools synchronized")
return true, nil
}); err != nil {
if err == wait.ErrWaitTimeout {
Expand Down

0 comments on commit e1203d4

Please sign in to comment.