diff --git a/pkg/build/controller/factory/factory.go b/pkg/build/controller/factory/factory.go index 7a3a4833c9ee..f3f53c5109b3 100644 --- a/pkg/build/controller/factory/factory.go +++ b/pkg/build/controller/factory/factory.go @@ -312,10 +312,7 @@ func (factory *ImageChangeControllerFactory) Create() controller.RunnableControl RetryManager: controller.NewQueueRetryManager( queue, cache.MetaNamespaceKeyFunc, - retryFunc("ImageStream update", func(err error) bool { - _, isFatal := err.(buildcontroller.ImageChangeControllerFatalError) - return isFatal - }), + retryFunc("ImageStream update", nil), flowcontrol.NewTokenBucketRateLimiter(1, 10), ), Handle: func(obj interface{}) error { diff --git a/pkg/build/controller/image_change_controller.go b/pkg/build/controller/image_change_controller.go index 4bb404394679..26fa7d2295e6 100644 --- a/pkg/build/controller/image_change_controller.go +++ b/pkg/build/controller/image_change_controller.go @@ -17,16 +17,6 @@ import ( imageapi "github.com/openshift/origin/pkg/image/api" ) -// ImageChangeControllerFatalError represents a fatal error while handling an image change -type ImageChangeControllerFatalError struct { - Reason string - Err error -} - -func (e ImageChangeControllerFatalError) Error() string { - return fmt.Sprintf("fatal error handling ImageStream change: %s, root error was: %s", e.Reason, e.Err.Error()) -} - // ImageChangeController watches for changes to ImageRepositories and triggers // builds when a new version of a tag referenced by a BuildConfig // is available.