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

Tweak signature in #3478 #3496

Merged
merged 1 commit into from
Oct 3, 2017
Merged

Tweak signature in #3478 #3496

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: 7 additions & 3 deletions pkg/model/awsmodel/autoscalinggroup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,19 @@ type AutoscalingGroupModelBuilder struct {
var _ fi.ModelBuilder = &AutoscalingGroupModelBuilder{}

func (b *AutoscalingGroupModelBuilder) Build(c *fi.ModelBuilderContext) error {
var err error
for _, ig := range b.InstanceGroups {
name := b.AutoscalingGroupName(ig)

// LaunchConfiguration
var launchConfiguration *awstasks.LaunchConfiguration
{
volumeSize, err := defaults.FindDefaultVolumeSize(fi.Int32Value(ig.Spec.RootVolumeSize), ig.Spec.Role)
if err != nil {
return fmt.Errorf("this case should not get hit, kops.Role not found %s", ig.Spec.Role)
volumeSize := fi.Int32Value(ig.Spec.RootVolumeSize)
if volumeSize == 0 {
volumeSize, err = defaults.DefaultInstanceGroupVolumeSize(ig.Spec.Role)
if err != nil {
return err
}
}
volumeType := fi.StringValue(ig.Spec.RootVolumeType)
volumeIops := fi.Int32Value(ig.Spec.RootVolumeIops)
Expand Down
26 changes: 11 additions & 15 deletions pkg/model/defaults/volumes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,16 @@ const (
DefaultVolumeSizeBastion = 32
)

// FindDefaultVolumeSize returns the default volume size based on role.
func FindDefaultVolumeSize(volumeSize int32, role kops.InstanceGroupRole) (int32, error) {
if volumeSize == 0 {
switch role {
case kops.InstanceGroupRoleMaster:
volumeSize = DefaultVolumeSizeMaster
case kops.InstanceGroupRoleNode:
volumeSize = DefaultVolumeSizeNode
case kops.InstanceGroupRoleBastion:
volumeSize = DefaultVolumeSizeBastion
default:
return -1, fmt.Errorf("this case should not get hit, kops.Role not found %s", role)
}
// DefaultInstanceGroupVolumeSize returns the default volume size for nodes in an InstanceGroup with the specified role
func DefaultInstanceGroupVolumeSize(role kops.InstanceGroupRole) (int32, error) {
switch role {
case kops.InstanceGroupRoleMaster:
return DefaultVolumeSizeMaster, nil
case kops.InstanceGroupRoleNode:
return DefaultVolumeSizeNode, nil
case kops.InstanceGroupRoleBastion:
return DefaultVolumeSizeBastion, nil
default:
return -1, fmt.Errorf("unknown InstanceGroup Role %s", role)
}

return volumeSize, nil
}
8 changes: 5 additions & 3 deletions pkg/model/gcemodel/autoscalinggroup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,11 @@ func (b *AutoscalingGroupModelBuilder) Build(c *fi.ModelBuilderContext) error {
var instanceTemplate *gcetasks.InstanceTemplate
{
volumeSize := fi.Int32Value(ig.Spec.RootVolumeSize)
volumeSize, err := defaults.FindDefaultVolumeSize(fi.Int32Value(ig.Spec.RootVolumeSize), ig.Spec.Role)
if err != nil {
return err
if volumeSize == 0 {
volumeSize, err = defaults.DefaultInstanceGroupVolumeSize(ig.Spec.Role)
if err != nil {
return err
}
}
volumeType := fi.StringValue(ig.Spec.RootVolumeType)
if volumeType == "" {
Expand Down