Skip to content

Commit

Permalink
Revert "cmd/openshift-install/create: Allow hung watch"
Browse files Browse the repository at this point in the history
This reverts commit 6dc1bf6, openshift#615.

109531f (cmd/openshift-install/create: Retry watch connections,
2018-11-02, openshift#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.
  • Loading branch information
wking committed Nov 27, 2018
1 parent adebbb9 commit b13b7fa
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions cmd/openshift-install/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -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...")
Expand Down

0 comments on commit b13b7fa

Please sign in to comment.