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

fix(spotinst): rename the label to match the feature flag

This commit is contained in:
liranp 2019-10-27 11:22:54 +02:00
parent 23c0cdab36
commit 04d83c6c04
No known key found for this signature in database
GPG Key ID: D5F03857002C1A93
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,7 @@ func (b *AutoscalingGroupModelBuilder) Build(c *fi.ModelBuilderContext) error {
name := b.AutoscalingGroupName(ig)
if featureflag.SpotinstHybrid.Enabled() {
if spotinstmodel.ManageInstanceGroup(ig) {
if spotinstmodel.HybridInstanceGroup(ig) {
klog.V(2).Infof("Skipping instance group: %q", name)
continue
}

24
pkg/model/spotinstmodel/instance_group.go
View File

@ -33,9 +33,10 @@ import (
)
const (
// InstanceGroupLabelManaged is the metadata label used on the instance
// group to specify that the Spotinst provider should be used to upon creation.
InstanceGroupLabelManaged = "spotinst.io/managed"
// InstanceGroupLabelHybrid is the metadata label used on the instance group
// to specify that the Spotinst provider should be used to upon creation.
InstanceGroupLabelHybrid = "spotinst.io/hybrid"
InstanceGroupLabelManaged = "spotinst.io/managed" // for backward compatibility
// InstanceGroupLabelSpotPercentage is the metadata label used on the
// instance group to specify the percentage of Spot instances that
@ -121,7 +122,7 @@ func (b *InstanceGroupModelBuilder) Build(c *fi.ModelBuilderContext) error {
name := b.AutoscalingGroupName(ig)
if featureflag.SpotinstHybrid.Enabled() {
if !ManageInstanceGroup(ig) {
if !HybridInstanceGroup(ig) {
klog.V(2).Infof("Skipping instance group: %q", name)
continue
}
@ -925,10 +926,15 @@ func defaultSpotPercentage(ig *kops.InstanceGroup) *float64 {
return &percentage
}
// ManageInstanceGroup indicates whether the instance group labeled with
// a metadata label `spotinst.io/managed` which means the Spotinst provider
// HybridInstanceGroup indicates whether the instance group labeled with
// a metadata label `spotinst.io/hybrid` which means the Spotinst provider
// should be used to upon creation if the `SpotinstHybrid` feature flag is on.
func ManageInstanceGroup(ig *kops.InstanceGroup) bool {
managed, _ := strconv.ParseBool(ig.ObjectMeta.Labels[InstanceGroupLabelManaged])
return managed
func HybridInstanceGroup(ig *kops.InstanceGroup) bool {
v, ok := ig.ObjectMeta.Labels[InstanceGroupLabelHybrid]
if !ok {
v = ig.ObjectMeta.Labels[InstanceGroupLabelManaged]
}
hybrid, _ := strconv.ParseBool(v)
return hybrid
}