Skip to content

bug 1801397: temporarily skip setting failures on degraded machine config pool #1473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deads2k merged 1 commit into from
Feb 17, 2020
Merged

bug 1801397: temporarily skip setting failures on degraded machine config pool #1473

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions pkg/operator/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/tools/cache"
"k8s.io/klog"

configv1 "github.com/openshift/api/config/v1"
operatorv1 "github.com/openshift/api/operator/v1"
Expand Down Expand Up @@ -555,6 +556,15 @@ func (optr *Operator) syncRequiredMachineConfigPools(_ *renderConfig) error {
!degraded {
continue
}
// TODO this should not be in any level we ship
// this is only so that the etcd operator can land. It skips setting the error when the machineconfigpool is degraded.
// because the etcd operator intentionally makes it degraded until we can remove the etcd-member from this repo.
if pool.Generation <= pool.Status.ObservedGeneration &&
isPoolStatusConditionTrue(pool, mcfgv1.MachineConfigPoolUpdated) &&
degraded {
klog.Errorf("error pool %s is not ready, retrying. Status: (pool degraded: %v total: %d, ready %d, updated: %d, unavailable: %d)", pool.Name, degraded, pool.Status.MachineCount, pool.Status.ReadyMachineCount, pool.Status.UpdatedMachineCount, pool.Status.UnavailableMachineCount)
continue
}
lastErr = fmt.Errorf("error pool %s is not ready, retrying. Status: (pool degraded: %v total: %d, ready %d, updated: %d, unavailable: %d)", pool.Name, degraded, pool.Status.MachineCount, pool.Status.ReadyMachineCount, pool.Status.UpdatedMachineCount, pool.Status.UnavailableMachineCount)
return false, nil
}
Expand Down