Skip to content

Commit

Permalink
Merge pull request #7528 from openshift-cherrypick-robot/cherry-pick-…
Browse files Browse the repository at this point in the history
…7518-to-release-4.14

[release-4.14] OCPBUGS-19702: Increase bootstrap timeout for vSphere platform by 30 mins
  • Loading branch information
openshift-merge-robot authored Sep 26, 2023
2 parents 5a019dd + e71933e commit 3b20717
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions cmd/openshift-install/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import (
"github.com/openshift/installer/pkg/gather/service"
timer "github.com/openshift/installer/pkg/metrics/timer"
"github.com/openshift/installer/pkg/types/baremetal"
"github.com/openshift/installer/pkg/types/vsphere"
cov1helpers "github.com/openshift/library-go/pkg/config/clusteroperator/v1helpers"
"github.com/openshift/library-go/pkg/route/routeapihelpers"
)
Expand Down Expand Up @@ -422,10 +423,10 @@ func waitForBootstrapComplete(ctx context.Context, config *rest.Config) *cluster
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
// Wait longer for baremetal, VSphere 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 {
if installConfig.(*installconfig.InstallConfig).Config.Platform.Name() == baremetal.Name || installConfig.(*installconfig.InstallConfig).Config.Platform.Name() == vsphere.Name {
timeout = 60 * time.Minute
}
}
Expand Down

0 comments on commit 3b20717

Please sign in to comment.