Skip to content

Autofill availability zones based on primary instance #901

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

Merged
merged 6 commits into from
Mar 24, 2020
Merged

Autofill availability zones based on primary instance #901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e3194d5
Autofill availability zones based on primary instance
vishalbollu Mar 23, 2020
ee8347c
Respond to PR
vishalbollu Mar 23, 2020
4519f2f
Merge branch 'master' into az-selection-based-on-primary-instance
deliahu Mar 23, 2020
ea53e7a
Merge branch 'master' into az-selection-based-on-primary-instance
vishalbollu Mar 23, 2020
92dd412
Merge branch 'master' into az-selection-based-on-primary-instance
vishalbollu Mar 24, 2020
442a44a
Merge branch 'master' into az-selection-based-on-primary-instance
vishalbollu Mar 24, 2020
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
13 changes: 2 additions & 11 deletions pkg/types/clusterconfig/availability_zones.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,14 @@ import (
var _azBlacklist = strset.New("us-east-1e")

func (cc *Config) validateAvailabilityZones(awsClient *aws.Client) error {
var extraInstances []string
if cc.Spot != nil && *cc.Spot && len(cc.SpotConfig.InstanceDistribution) >= 0 {
for _, instanceType := range cc.SpotConfig.InstanceDistribution {
if instanceType != *cc.InstanceType {
extraInstances = append(extraInstances, instanceType)
}
}
}

if len(cc.AvailabilityZones) == 0 {
if err := cc.setDefaultAvailabilityZones(awsClient, extraInstances...); err != nil {
if err := cc.setDefaultAvailabilityZones(awsClient); err != nil {
return err
}
return nil
}

if err := cc.validateUserAvailabilityZones(awsClient, extraInstances...); err != nil {
if err := cc.validateUserAvailabilityZones(awsClient); err != nil {
return err
}

Expand Down
20 changes: 8 additions & 12 deletions pkg/types/clusterconfig/clusterconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,24 +497,12 @@ func (cc *Config) Validate(awsClient *aws.Client) error {
}
}

// instance_distribution cleanup must be performed before availability_zone cleanup
if cc.Spot != nil && *cc.Spot && len(cc.SpotConfig.InstanceDistribution) >= 0 {
cleanedDistribution := []string{*cc.InstanceType}
for _, instanceType := range cc.SpotConfig.InstanceDistribution {
if instanceType != *cc.InstanceType {
cleanedDistribution = append(cleanedDistribution, instanceType)
}
}
cc.SpotConfig.InstanceDistribution = cleanedDistribution
}

if err := cc.validateAvailabilityZones(awsClient); err != nil {
return errors.Wrap(err, AvailabilityZonesKey)
}

if cc.Spot != nil && *cc.Spot {
cc.AutoFillSpot(awsClient)

chosenInstance := aws.InstanceMetadatas[*cc.Region][*cc.InstanceType]
compatibleSpots := CompatibleSpotInstances(awsClient, chosenInstance, cc.SpotConfig.MaxPrice, _spotInstanceDistributionLength)
if len(compatibleSpots) == 0 {
Expand Down Expand Up @@ -654,6 +642,14 @@ func CompatibleSpotInstances(awsClient *aws.Client, targetInstance aws.InstanceM

func AutoGenerateSpotConfig(awsClient *aws.Client, spotConfig *SpotConfig, region string, instanceType string) error {
chosenInstance := aws.InstanceMetadatas[region][instanceType]
cleanedDistribution := []string{instanceType}
for _, spotInstance := range spotConfig.InstanceDistribution {
if spotInstance != instanceType {
cleanedDistribution = append(cleanedDistribution, spotInstance)
}
}
spotConfig.InstanceDistribution = cleanedDistribution

if len(spotConfig.InstanceDistribution) == 1 {
compatibleSpots := CompatibleSpotInstances(awsClient, chosenInstance, spotConfig.MaxPrice, _spotInstanceDistributionLength)
if len(compatibleSpots) == 0 {
Expand Down