kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow disabling warm pool by setting WarmPool.MaxSize to 0

This commit is contained in:
John Gardiner Myers 2021-04-24 16:35:46 -07:00
parent 09276d47e6
commit 044b5f6d0d
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/apis/kops/instancegroup.go
View File

@ -199,6 +199,10 @@ type WarmPoolSpec struct {
EnableLifecyleHook bool `json:"enableLifecycleHook,omitempty"` EnableLifecyleHook bool `json:"enableLifecycleHook,omitempty"`
} }
func (in *WarmPoolSpec) IsEnabled() bool {
return in != nil && (in.MaxSize == nil || *in.MaxSize != 0)
}
const ( const (
// SpotAllocationStrategyLowestPrices indicates a lowest-price strategy // SpotAllocationStrategyLowestPrices indicates a lowest-price strategy
SpotAllocationStrategyLowestPrices = "lowest-price" SpotAllocationStrategyLowestPrices = "lowest-price"

4
pkg/model/awsmodel/autoscalinggroup.go
View File

@ -89,12 +89,12 @@ func (b *AutoscalingGroupModelBuilder) Build(c *fi.ModelBuilderContext) error {
warmPool := ig.Spec.WarmPool warmPool := ig.Spec.WarmPool
{ {
enabled := fi.Bool(warmPool != nil) enabled := fi.Bool(warmPool.IsEnabled())
warmPoolTask := &awstasks.WarmPool{ warmPoolTask := &awstasks.WarmPool{
Name: &name, Name: &name,
Enabled: enabled, Enabled: enabled,
} }
if warmPool != nil { if warmPool.IsEnabled() {
warmPoolTask.MinSize = warmPool.MinSize warmPoolTask.MinSize = warmPool.MinSize
warmPoolTask.MaxSize = warmPool.MaxSize warmPoolTask.MaxSize = warmPool.MaxSize

4
pkg/model/iam.go
View File

@ -77,7 +77,7 @@ func (b *IAMModelBuilder) Build(c *fi.ModelBuilderContext) error {
for profileARN, igRole := range sharedProfileARNsToIGRole { for profileARN, igRole := range sharedProfileARNsToIGRole {
lchPermissions := false lchPermissions := false
for _, ig := range b.InstanceGroups { for _, ig := range b.InstanceGroups {
if ig.Spec.Role == igRole && ig.Spec.WarmPool != nil && ig.Spec.WarmPool.EnableLifecyleHook { if ig.Spec.Role == igRole && ig.Spec.WarmPool.IsEnabled() && ig.Spec.WarmPool.EnableLifecyleHook {
lchPermissions = true lchPermissions = true
break break
@ -102,7 +102,7 @@ func (b *IAMModelBuilder) Build(c *fi.ModelBuilderContext) error {
for igRole := range managedRoles { for igRole := range managedRoles {
warmPool := false warmPool := false
for _, ig := range b.InstanceGroups { for _, ig := range b.InstanceGroups {
if ig.Spec.Role == igRole && ig.Spec.WarmPool != nil && ig.Spec.WarmPool.EnableLifecyleHook { if ig.Spec.Role == igRole && ig.Spec.WarmPool.IsEnabled() && ig.Spec.WarmPool.EnableLifecyleHook {
warmPool = true warmPool = true
break break

2
upup/pkg/fi/nodeup/command.go
View File

@ -361,7 +361,7 @@ func (c *NodeUpCommand) Run(out io.Writer) error {
klog.Exitf("error closing target: %v", err) klog.Exitf("error closing target: %v", err)
} }
if modelContext.InstanceGroup.Spec.WarmPool != nil && modelContext.InstanceGroup.Spec.WarmPool.EnableLifecyleHook { if modelContext.InstanceGroup.Spec.WarmPool.IsEnabled() && modelContext.InstanceGroup.Spec.WarmPool.EnableLifecyleHook {
if api.CloudProviderID(c.cluster.Spec.CloudProvider) == api.CloudProviderAWS { if api.CloudProviderID(c.cluster.Spec.CloudProvider) == api.CloudProviderAWS {
err := completeWarmingLifecycleAction(cloud.(awsup.AWSCloud), modelContext) err := completeWarmingLifecycleAction(cloud.(awsup.AWSCloud), modelContext)
if err != nil { if err != nil {