From 4c34752405df693e737c61d7a46fdebbc3261c4f Mon Sep 17 00:00:00 2001 From: Sally O'Malley Date: Mon, 10 Dec 2018 14:36:04 -0500 Subject: [PATCH] log,return error if console URL is not obtained --- cmd/openshift-install/create.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cmd/openshift-install/create.go b/cmd/openshift-install/create.go index 87239c914b..dccc2a3af9 100644 --- a/cmd/openshift-install/create.go +++ b/cmd/openshift-install/create.go @@ -313,14 +313,16 @@ func waitForConsole(ctx context.Context, config *rest.Config, directory string) if silenceRemaining == 0 { logrus.Debug("Still waiting for the console route...") silenceRemaining = logDownsample + err = errors.New("no routes found in openshift-console namespace") } } }, 2*time.Second, consoleRouteContext.Done()) - if err != nil { - return "", errors.Wrap(err, "waiting for console route to be created") + err = consoleRouteContext.Err() + if err != nil && err != context.Canceled { + return url, errors.Wrap(err, "waiting for openshift-console URL") } if url == "" { - return url, errors.Wrap(err, "could not obtain openshift-console URL from route") + return url, errors.New("could not get openshift-console URL") } return url, nil }