Skip to content

Remove stale conditions from RemoveStaleConditionsController() #356

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
openshift-merge-robot merged 1 commit into from
Dec 4, 2019
Merged

Remove stale conditions from RemoveStaleConditionsController() #356

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
30 changes: 15 additions & 15 deletions pkg/console/starter/starter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (
"github.com/openshift/library-go/pkg/controller/controllercmd"
"github.com/openshift/library-go/pkg/operator/management"
"github.com/openshift/library-go/pkg/operator/resourcesynccontroller"
"github.com/openshift/library-go/pkg/operator/staleconditions"
"github.com/openshift/library-go/pkg/operator/status"
"github.com/openshift/library-go/pkg/operator/unsupportedconfigoverridescontroller"
"github.com/openshift/library-go/pkg/operator/v1helpers"
Expand Down Expand Up @@ -250,19 +249,20 @@ func RunOperator(ctx *controllercmd.ControllerContext) error {
ctx.EventRecorder,
)

staleConditionsController := staleconditions.NewRemoveStaleConditions(
[]string{
// in 4.1.0 we directly set this set of conditions. We should no longer do this.
// in 4.3.0+ we can remove this
"Degraded",
// in follow-up PRs, we should stop using the rest directly:
"Progressing",
"Available",
// "Faililng"
},
operatorClient,
ctx.EventRecorder,
)
// NOTE: be sure to uncomment the .Run() below if using this
//staleConditionsController := staleconditions.NewRemoveStaleConditions(
// []string{
// // If a condition is removed, we need to add it here for at least
// // one release to ensure the operator does not permanently wedge.
// // Please do something like the following:
// //
// // example: in 4.x.x we removed FooDegraded condition and can remove
// // this in 4.x+1:
// // "FooDegraded",
// },
// operatorClient,
// ctx.EventRecorder,
//)

configUpgradeableController := unsupportedconfigoverridescontroller.NewUnsupportedConfigOverridesController(operatorClient, ctx.EventRecorder)
logLevelController := loglevel.NewClusterOperatorLoggingController(operatorClient, ctx.EventRecorder)
Expand Down Expand Up @@ -292,7 +292,7 @@ func RunOperator(ctx *controllercmd.ControllerContext) error {
go logLevelController.Run(1, ctx.Done())
go managementStateController.Run(1, ctx.Done())
go cliDownloadsController.Run(1, ctx.Done())
go staleConditionsController.Run(1, ctx.Done())
// go staleConditionsController.Run(1, ctx.Done())

<-ctx.Done()
return fmt.Errorf("stopped")
Expand Down