Skip to content

DNM: GCP: Increase bootstrap and cluster creation timeouts #10491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sadasu wants to merge 1 commit into
base: main
Choose a base branch
from
+27 −7
Open

DNM: GCP: Increase bootstrap and cluster creation timeouts #10491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions cmd/openshift-install/command/waitfor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import (
"github.com/openshift/installer/pkg/types/aws"
"github.com/openshift/installer/pkg/types/baremetal"
"github.com/openshift/installer/pkg/types/dns"
"github.com/openshift/installer/pkg/types/gcp"
cov1helpers "github.com/openshift/library-go/pkg/config/clusteroperator/v1helpers"
"github.com/openshift/library-go/pkg/route/routeapihelpers"
)
Expand Down Expand Up @@ -102,6 +103,15 @@ func waitForInitializedCluster(ctx context.Context, config *rest.Config, assetst
if installConfig.(*installconfig.InstallConfig).Config.AWS != nil &&
installConfig.(*installconfig.InstallConfig).Config.AWS.UserProvisionedDNS == dns.UserProvisionedDNSEnabled {
timeout = 60 * time.Minute
logrus.Infof("Increasing cluster creation timeout on AWS to %v since UserProvisionedDNS is enabled", timeout)
}
case gcp.Name:
// Wait longer for GCP with userProvisionedDNS enabled.
// Tests show that with this feature enabled, MCO needs additional time to complete tasks
if installConfig.(*installconfig.InstallConfig).Config.GCP != nil &&
installConfig.(*installconfig.InstallConfig).Config.GCP.UserProvisionedDNS == dns.UserProvisionedDNSEnabled {
timeout = 60 * time.Minute
logrus.Infof("Increasing cluster creation timeout on GCP to %v since UserProvisionedDNS is enabled", timeout)
}
}
}
Expand Down
24 changes: 17 additions & 7 deletions cmd/openshift-install/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,14 +407,24 @@ func waitForBootstrapComplete(ctx context.Context, config *rest.Config) *cluster

timeout := 45 * time.Minute

// Wait longer for baremetal, VSphere due to length of time it takes to boot
if platformName == baremetal.Name || platformName == vsphere.Name {
switch platformName {
case baremetal.Name, vsphere.Name:
// Wait longer for baremetal, VSphere due to length of time it takes to boot
timeout = 60 * time.Minute
}
// For AWS, only increase timeout when UserProvisionedDNS is enabled
if platformName == aws.Name && installConfig != nil && installConfig.Config.AWS != nil && installConfig.Config.AWS.UserProvisionedDNS == dns.UserProvisionedDNSEnabled {
timeout = 60 * time.Minute
logrus.Infof("Increasing bootstrapping timeout on AWS to %v since UserProvisionedDNS is enabled", timeout)
case aws.Name:
// Wait longer for AWS with userProvisionedDNS enabled.
// Tests show that with this feature enabled, MCO needs additional time to complete tasks
if installConfig != nil && installConfig.Config.AWS != nil && installConfig.Config.AWS.UserProvisionedDNS == dns.UserProvisionedDNSEnabled {
timeout = 60 * time.Minute
logrus.Infof("Increasing bootstrapping timeout on AWS to %v since UserProvisionedDNS is enabled", timeout)
}
case gcp.Name:
// Wait longer for GCP with userProvisionedDNS enabled.
// Tests show that with this feature enabled, MCO needs additional time to complete tasks
if installConfig != nil && installConfig.Config.GCP != nil && installConfig.Config.GCP.UserProvisionedDNS == dns.UserProvisionedDNSEnabled {
timeout = 60 * time.Minute
logrus.Infof("Increasing bootstrapping timeout on GCP to %v since UserProvisionedDNS is enabled", timeout)
}
}

untilTime = time.Now().Add(timeout)
Expand Down