openshift/installer
1
0
Fork 0
mirror of https://github.com/openshift/installer.git synced 2026-02-05 06:46:36 +01:00
Code Issues Releases Activity

Merge pull request #6010 from honza/bootstrap-timeout-fix

Browse Source 
Bug 2090816: Increase bootstrap timeout, not k8s API timeout
This commit is contained in:
openshift-ci[bot]
2022-06-16 03:26:48 +00:00
committed by GitHub
parent 4f2095ae10 e4f7e09b81
commit e20220ff41
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/openshift-install/create.go
View File

@@ -351,15 +351,6 @@ func waitForBootstrapComplete(ctx context.Context, config *rest.Config) *cluster
apiTimeout := 20 * time.Minute
// Wait longer for baremetal, due to length of time it takes to boot
if assetStore, err := assetstore.NewStore(rootOpts.dir); err == nil {
if installConfig, err := assetStore.Load(&installconfig.InstallConfig{}); err == nil && installConfig != nil {
if installConfig.(*installconfig.InstallConfig).Config.Platform.Name() == baremetal.Name {
apiTimeout = 60 * time.Minute
}
}
}
untilTime := time.Now().Add(apiTimeout)
logrus.Infof("Waiting up to %v (until %v) for the Kubernetes API at %s...",
apiTimeout, untilTime.Format(time.Kitchen), config.Host)
@@ -411,6 +402,16 @@ func waitForBootstrapComplete(ctx context.Context, config *rest.Config) *cluster
// completed.
func waitForBootstrapConfigMap(ctx context.Context, client *kubernetes.Clientset) *clusterCreateError {
timeout := 30 * time.Minute
// Wait longer for baremetal, due to length of time it takes to boot
if assetStore, err := assetstore.NewStore(rootOpts.dir); err == nil {
if installConfig, err := assetStore.Load(&installconfig.InstallConfig{}); err == nil && installConfig != nil {
if installConfig.(*installconfig.InstallConfig).Config.Platform.Name() == baremetal.Name {
timeout = 60 * time.Minute
}
}
}
untilTime := time.Now().Add(timeout)
logrus.Infof("Waiting up to %v (until %v) for bootstrapping to complete...",
timeout, untilTime.Format(time.Kitchen))