Merge pull request #6015 from spotinst/fix-lb-attachment

Spotinst: Skip the creation of LoadBalancerAttachment tasks if Spotinst is enabled
kubernetes · Nov 13, 2018 · 35f0eaa · 35f0eaa
2 parents 892d26e + 9db3567
commit 35f0eaa
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 17 deletions.
diff --git a/pkg/model/awsmodel/BUILD.bazel b/pkg/model/awsmodel/BUILD.bazel
@@ -13,6 +13,7 @@ go_library(
     deps = [
         "//pkg/apis/kops:go_default_library",
         "//pkg/dns:go_default_library",
+        "//pkg/featureflag:go_default_library",
         "//pkg/model:go_default_library",
         "//pkg/model/defaults:go_default_library",
         "//upup/pkg/fi:go_default_library",

diff --git a/pkg/model/awsmodel/api_loadbalancer.go b/pkg/model/awsmodel/api_loadbalancer.go
@@ -25,6 +25,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/dns"
+	"k8s.io/kops/pkg/featureflag"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup/awstasks"
 	"k8s.io/kops/upup/pkg/fi/fitasks"
@@ -254,16 +255,21 @@ func (b *APILoadBalancerBuilder) Build(c *fi.ModelBuilderContext) error {
 		masterKeypair.AlternateNameTasks = append(masterKeypair.AlternateNameTasks, elb)
 	}
 
-	for _, ig := range b.MasterInstanceGroups() {
-		t := &awstasks.LoadBalancerAttachment{
-			Name:      s("api-" + ig.ObjectMeta.Name),
-			Lifecycle: b.Lifecycle,
+	// When Spotinst Elastigroups are used, there is no need to create
+	// a separate task for the attachment of the load balancer since this
+	// is already done as part of the Elastigroup's creation, if needed.
+	if !featureflag.Spotinst.Enabled() {
+		for _, ig := range b.MasterInstanceGroups() {
+			t := &awstasks.LoadBalancerAttachment{
+				Name:      s("api-" + ig.ObjectMeta.Name),
+				Lifecycle: b.Lifecycle,
+
+				LoadBalancer:     b.LinkToELB("api"),
+				AutoscalingGroup: b.LinkToAutoscalingGroup(ig),
+			}
 
-			LoadBalancer:     b.LinkToELB("api"),
-			AutoscalingGroup: b.LinkToAutoscalingGroup(ig),
+			c.AddTask(t)
 		}
-
-		c.AddTask(t)
 	}
 
 	return nil

diff --git a/pkg/model/bastion.go b/pkg/model/bastion.go
@@ -21,6 +21,7 @@ import (
 
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/kops/pkg/apis/kops"
+	"k8s.io/kops/pkg/featureflag"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup/awstasks"
 )
@@ -236,18 +237,23 @@ func (b *BastionModelBuilder) Build(c *fi.ModelBuilderContext) error {
 		c.AddTask(elb)
 	}
 
-	for _, ig := range bastionInstanceGroups {
-		// We build the ASG when we iterate over the instance groups
+	// When Spotinst Elastigroups are used, there is no need to create
+	// a separate task for the attachment of the load balancer since this
+	// is already done as part of the Elastigroup's creation, if needed.
+	if !featureflag.Spotinst.Enabled() {
+		for _, ig := range bastionInstanceGroups {
+			// We build the ASG when we iterate over the instance groups
 
-		// Attach the ELB to the ASG
-		t := &awstasks.LoadBalancerAttachment{
-			Name:      s("bastion-elb-attachment"),
-			Lifecycle: b.Lifecycle,
+			// Attach the ELB to the ASG
+			t := &awstasks.LoadBalancerAttachment{
+				Name:      s("bastion-elb-attachment"),
+				Lifecycle: b.Lifecycle,
 
-			LoadBalancer:     elb,
-			AutoscalingGroup: b.LinkToAutoscalingGroup(ig),
+				LoadBalancer:     elb,
+				AutoscalingGroup: b.LinkToAutoscalingGroup(ig),
+			}
+			c.AddTask(t)
 		}
-		c.AddTask(t)
 	}
 
 	bastionPublicName := ""