Skip to content

Bug 1740121: Prevent global sync error degraded status flapping #173

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
merged 1 commit into from
Aug 12, 2019
Merged

Bug 1740121: Prevent global sync error degraded status flapping #173

Show file tree
Hide file tree
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
5 changes: 3 additions & 2 deletions pkg/operator2/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,10 +260,11 @@ func (c *authOperator) Sync(obj metav1.Object) error {
syncErr := c.handleSync(operatorConfigCopy)
// this is a catch all degraded state that we only set when we are otherwise not degraded
globalDegradedErr := syncErr
if isDegraded(operatorConfigCopy) {
const globalDegradedPrefix = "OperatorSync"
if isDegradedIgnoreGlobal(operatorConfigCopy, globalDegradedPrefix) {
globalDegradedErr = nil // unset because we are already degraded for some other reason
}
handleDegraded(operatorConfigCopy, "OperatorSync", globalDegradedErr)
handleDegraded(operatorConfigCopy, globalDegradedPrefix, globalDegradedErr)

if _, _, err := v1helpers.UpdateStatus(c.authOperatorConfigClient, func(status *operatorv1.OperatorStatus) error {
// store a copy of our starting conditions, we need to preserve last transition time
Expand Down
6 changes: 4 additions & 2 deletions pkg/operator2/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,11 @@ func handleDegraded(operatorConfig *operatorv1.Authentication, prefix string, er
})
}

func isDegraded(operatorConfig *operatorv1.Authentication) bool {
func isDegradedIgnoreGlobal(operatorConfig *operatorv1.Authentication, prefix string) bool {
globalDegraded := prefix + operatorv1.OperatorStatusTypeDegraded
for _, condition := range operatorConfig.Status.Conditions {
if strings.HasSuffix(condition.Type, operatorv1.OperatorStatusTypeDegraded) &&
if condition.Type != globalDegraded && // we want to know if we are degraded for something other than this
strings.HasSuffix(condition.Type, operatorv1.OperatorStatusTypeDegraded) &&
condition.Status == operatorv1.ConditionTrue {
return true
}
Expand Down