From b13b7fa831678feda9b9e5710753e63fc5b9621f Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Tue, 27 Nov 2018 12:33:30 -0800 Subject: [PATCH] Revert "cmd/openshift-install/create: Allow hung watch" This reverts commit 6dc1bf60cdb42ee26937e0e5702c536a52f9fdbb, #615. 109531f3 (cmd/openshift-install/create: Retry watch connections, 2018-11-02, #606) made the watch re-connects reliable, so make watch timeouts fatal again. This avoids confusing users by showing "Install complete!" messages when they may actually have a hung bootstrap process. --- cmd/openshift-install/create.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmd/openshift-install/create.go b/cmd/openshift-install/create.go index 411ae3f6bc0..5ba6517f63a 100644 --- a/cmd/openshift-install/create.go +++ b/cmd/openshift-install/create.go @@ -235,8 +235,7 @@ func destroyBootstrap(ctx context.Context, directory string) (err error) { }, ) if err != nil { - logrus.Error(errors.Wrap(err, "waiting for bootstrap-complete")) - return nil + return errors.Wrap(err, "waiting for bootstrap-complete") } logrus.Info("Destroying the bootstrap resources...")