From 5073cfb952f2b2d7eed3fcc7cedc7b48478a13d4 Mon Sep 17 00:00:00 2001 From: patrickdillon Date: Wed, 27 Oct 2021 15:39:02 -0400 Subject: [PATCH] Bug 2016955: Set AWS Bootstrap Type == Master This commit sets the boostrap node to use the same instance type as the control-plane nodes in order to avoid failures that we have seen when the hard-coded instance type of m5 is unavailable in the zone. --- pkg/tfvars/aws/aws.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkg/tfvars/aws/aws.go b/pkg/tfvars/aws/aws.go index 873425afbd2..be4687b5610 100644 --- a/pkg/tfvars/aws/aws.go +++ b/pkg/tfvars/aws/aws.go @@ -3,7 +3,6 @@ package aws import ( "encoding/json" - "fmt" "github.com/pkg/errors" "sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsprovider/v1beta1" @@ -11,7 +10,6 @@ import ( configaws "github.com/openshift/installer/pkg/asset/installconfig/aws" "github.com/openshift/installer/pkg/types" typesaws "github.com/openshift/installer/pkg/types/aws" - "github.com/openshift/installer/pkg/types/aws/defaults" ) type config struct { @@ -114,15 +112,13 @@ func TFVars(sources TFVarsSources) ([]byte, error) { return nil, errors.New("EBS IOPS must be configured for the io1 root volume") } - instanceClass := defaults.InstanceClass(masterConfig.Placement.Region, sources.Architecture) - cfg := &config{ CustomEndpoints: endpoints, Region: masterConfig.Placement.Region, ExtraTags: tags, MasterAvailabilityZones: masterAvailabilityZones, WorkerAvailabilityZones: workerAvailabilityZones, - BootstrapInstanceType: fmt.Sprintf("%s.large", instanceClass), + BootstrapInstanceType: masterConfig.InstanceType, MasterInstanceType: masterConfig.InstanceType, Size: *rootVolume.EBS.VolumeSize, Type: *rootVolume.EBS.VolumeType,