Merge pull request #517 from mfojtik/remove-stale-migrator

Bug 1851351: Remove stale EtcdMemberIPMigratorDegraded condition
openshift · Jan 8, 2021 · 7df8310 · 7df8310
2 parents 2a22d46 + 5fda1fe
commit 7df8310
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 0 deletions.
diff --git a/pkg/operator/starter.go b/pkg/operator/starter.go
@@ -18,6 +18,7 @@ import (
 	"github.com/openshift/library-go/pkg/controller/controllercmd"
 	"github.com/openshift/library-go/pkg/operator/genericoperatorclient"
 	"github.com/openshift/library-go/pkg/operator/resource/resourceapply"
+	"github.com/openshift/library-go/pkg/operator/staleconditions"
 	"github.com/openshift/library-go/pkg/operator/staticpod"
 	"github.com/openshift/library-go/pkg/operator/staticpod/controller/revision"
 	"github.com/openshift/library-go/pkg/operator/staticresourcecontroller"
@@ -223,11 +224,21 @@ func RunOperator(ctx context.Context, controllerContext *controllercmd.Controlle
 		controllerContext.EventRecorder,
 	)
 
+	staleConditions := staleconditions.NewRemoveStaleConditionsController(
+		[]string{
+			// IP migrator was removed in 4.5, however older clusters can still have this condition set and it might prevent upgrades
+			"EtcdMemberIPMigratorDegraded",
+		},
+		operatorClient,
+		controllerContext.EventRecorder,
+	)
+
 	operatorInformers.Start(ctx.Done())
 	kubeInformersForNamespaces.Start(ctx.Done())
 	configInformers.Start(ctx.Done())
 	dynamicInformers.Start(ctx.Done())
 
+	go staleConditions.Run(ctx, 1)
 	go fsyncMetricController.Run(ctx, 1)
 	go staticResourceController.Run(ctx, 1)
 	go targetConfigReconciler.Run(ctx, 1)

diff --git a/...r/github.com/openshift/library-go/pkg/operator/staleconditions/remove_stale_conditions.go b/...r/github.com/openshift/library-go/pkg/operator/staleconditions/remove_stale_conditions.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -214,6 +214,7 @@ github.com/openshift/library-go/pkg/operator/resource/resourceread
 github.com/openshift/library-go/pkg/operator/resource/retry
 github.com/openshift/library-go/pkg/operator/resourcesynccontroller
 github.com/openshift/library-go/pkg/operator/revisioncontroller
+github.com/openshift/library-go/pkg/operator/staleconditions
 github.com/openshift/library-go/pkg/operator/staticpod
 github.com/openshift/library-go/pkg/operator/staticpod/certsyncpod
 github.com/openshift/library-go/pkg/operator/staticpod/controller/backingresource