Skip to content

Commit

Permalink
Merge pull request openshift#894 from wking/waiting-up-to-logs
Browse files Browse the repository at this point in the history
cmd/openshift-install/create: Add "up to" to "Waiting for ..." logs
  • Loading branch information
openshift-merge-robot committed Dec 13, 2018
2 parents cf3c5e6 + d5d2fc4 commit 61f5064
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions cmd/openshift-install/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ func destroyBootstrap(ctx context.Context, config *rest.Config, directory string
discovery := client.Discovery()

apiTimeout := 30 * time.Minute
logrus.Infof("Waiting %v for the Kubernetes API...", apiTimeout)
logrus.Infof("Waiting up to %v for the Kubernetes API...", apiTimeout)
apiContext, cancel := context.WithTimeout(ctx, apiTimeout)
defer cancel()
// Poll quickly so we notice changes, but only log when the response
Expand Down Expand Up @@ -227,7 +227,7 @@ func destroyBootstrap(ctx context.Context, config *rest.Config, directory string
events := client.CoreV1().Events("kube-system")

eventTimeout := 30 * time.Minute
logrus.Infof("Waiting %v for the bootstrap-complete event...", eventTimeout)
logrus.Infof("Waiting up to %v for the bootstrap-complete event...", eventTimeout)
eventContext, cancel := context.WithTimeout(ctx, eventTimeout)
defer cancel()
_, err = Until(
Expand Down Expand Up @@ -289,7 +289,7 @@ func waitForConsole(ctx context.Context, config *rest.Config, directory string)
}

consoleRouteTimeout := 10 * time.Minute
logrus.Infof("Waiting %v for the openshift-console route to be created...", consoleRouteTimeout)
logrus.Infof("Waiting up to %v for the openshift-console route to be created...", consoleRouteTimeout)
consoleRouteContext, cancel := context.WithTimeout(ctx, consoleRouteTimeout)
defer cancel()
// Poll quickly but only log when the response
Expand Down

0 comments on commit 61f5064

Please sign in to comment.