Skip to content
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

Jump to bottom

Bug 2017986: Set AWS Bootstrap Type == Master #5338

Merged
merged 1 commit into from Oct 29, 2021
Merged

Bug 2017986: Set AWS Bootstrap Type == Master #5338

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 1 addition & 5 deletions pkg/tfvars/aws/aws.go
View file
Open in desktop
Expand Up @@ -3,15 +3,13 @@ package aws

import (
"encoding/json"
"fmt"

"github.com/pkg/errors"
"sigs.k8s.io/cluster-api-provider-aws/pkg/apis/awsprovider/v1beta1"

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 {
Expand Down Expand Up @@ -112,15 +110,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)

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,
Expand Down