Skip to content

Update cluster.go #600

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 4 commits into from
Nov 26, 2019
Merged

Update cluster.go #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f713277
Update cluster.go
vishalbollu Nov 26, 2019
431ad47
Remove redundant string interpolation variable
vishalbollu Nov 26, 2019
f7981dd
Reorder and add units to instance volume size
vishalbollu Nov 26, 2019
bdc1320
Merge branch 'master' into fix-error-message-missing-region
vishalbollu Nov 26, 2019
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
2 changes: 1 addition & 1 deletion cli/cmd/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ func refreshCachedClusterConfig(awsCreds *AWSCredentials) *clusterconfig.Cluster
}

if userClusterConfig.Region == nil {
errors.Exit(fmt.Sprintf("unable to find %s; please configure \"%s\" to the s3 region of an existing cortex cluster or create a cortex cluster with `cortex cluster up`", clusterconfig.RegionKey, clusterconfig.RegionKey))
errors.Exit(fmt.Sprintf("unable to find an existing cortex cluster; please configure \"%s\" to the s3 region of an existing cortex cluster or create a cortex cluster with `cortex cluster up`", clusterconfig.RegionKey))
}

out, err := runRefreshClusterConfig(userClusterConfig, awsCreds)
Expand Down
3 changes: 2 additions & 1 deletion pkg/lib/clusterconfig/clusterconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,9 +719,10 @@ func (cc *ClusterConfig) UserFacingTable() []table.KV {
items = append(items, table.KV{K: BucketUserFacingKey, V: *cc.Bucket})
items = append(items, table.KV{K: SpotUserFacingKey, V: s.YesNo(*cc.Spot)})
items = append(items, table.KV{K: InstanceTypeUserFacingKey, V: *cc.InstanceType})
items = append(items, table.KV{K: InstanceVolumeSizeUserFacingKey, V: cc.InstanceVolumeSize})
items = append(items, table.KV{K: MinInstancesUserFacingKey, V: *cc.MinInstances})
items = append(items, table.KV{K: MaxInstancesUserFacingKey, V: *cc.MaxInstances})
items = append(items, table.KV{K: InstanceVolumeSizeUserFacingKey, V: cc.InstanceVolumeSize})

if cc.Spot != nil {
items = append(items, table.KV{K: InstanceDistributionUserFacingKey, V: cc.SpotConfig.InstanceDistribution})
items = append(items, table.KV{K: OnDemandBaseCapacityUserFacingKey, V: *cc.SpotConfig.OnDemandBaseCapacity})
Expand Down
2 changes: 1 addition & 1 deletion pkg/lib/clusterconfig/config_key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const (
InstanceTypeUserFacingKey = "instance type"
MinInstancesUserFacingKey = "min instances"
MaxInstancesUserFacingKey = "max instances"
InstanceVolumeSizeUserFacingKey = "instance volume size"
InstanceVolumeSizeUserFacingKey = "instance volume size (Gi)"
InstanceDistributionUserFacingKey = "spot instance distribution"
OnDemandBaseCapacityUserFacingKey = "spot on demand base capacity"
OnDemandPercentageAboveBaseCapacityUserFacingKey = "spot on demand percentage above base capacity"
Expand Down