Remove launch configurations in favour of launch templates

cmd/kops/integration_test.go

@@ -60,7 +60,6 @@ type integrationTest struct {
 	expectPolicies bool
 	// expectServiceAccountRoles is true if we expect to assign per-ServiceAccount IAM roles (instead of just using the node roles)
 	expectServiceAccountRoles bool
-	launchConfiguration       bool
 	lifecycleOverrides        []string
 	sshKey                    bool
 	// caKey is true if we should use a provided ca.crt & ca.key as our CA
@@ -128,11 +127,6 @@ func (i *integrationTest) withPrivate() *integrationTest {
 	return i
 }
 
-func (i *integrationTest) withLaunchConfiguration() *integrationTest {
-	i.launchConfiguration = true
-	return i
-}
-
 func (i *integrationTest) withBastionUserData() *integrationTest {
 	i.bastionUserData = true
 	return i
@@ -347,18 +341,6 @@ func TestDockerCustom(t *testing.T) {
 	newIntegrationTest("docker.example.com", "docker-custom").runTestCloudformation(t)
 }
 
-// TestLaunchConfigurationASG tests ASGs using launch configurations instead of launch templates
-func TestLaunchConfigurationASG(t *testing.T) {
-	featureflag.ParseFlags("-EnableLaunchTemplates")
-	unsetFeatureFlags := func() {
-		featureflag.ParseFlags("+EnableLaunchTemplates")
-	}
-	defer unsetFeatureFlags()
-
-	newIntegrationTest("launchtemplates.example.com", "launch_templates").withZones(3).withLaunchConfiguration().runTestTerraformAWS(t)
-	newIntegrationTest("launchtemplates.example.com", "launch_templates").withZones(3).withLaunchConfiguration().runTestCloudformation(t)
-}
-
 // TestPublicJWKS runs a simple configuration, but with UseServiceAccountIAM and PublicJWKS enabled
 func TestPublicJWKS(t *testing.T) {
 	featureflag.ParseFlags("+UseServiceAccountIAM,+PublicJWKS")
@@ -536,22 +518,15 @@ func (i *integrationTest) runTestTerraformAWS(t *testing.T) {
 
 	expectedFilenames := []string{}
 
-	if i.launchConfiguration {
-		expectedFilenames = append(expectedFilenames, "aws_launch_configuration_nodes."+i.clusterName+"_user_data")
-	} else {
-		expectedFilenames = append(expectedFilenames, "aws_launch_template_nodes."+i.clusterName+"_user_data")
-	}
+	expectedFilenames = append(expectedFilenames, "aws_launch_template_nodes."+i.clusterName+"_user_data")
+
 	if i.sshKey {
 		expectedFilenames = append(expectedFilenames, "aws_key_pair_kubernetes."+i.clusterName+"-c4a6ed9aa889b9e2c39cd663eb9c7157_public_key")
 	}
 
 	for j := 0; j < i.zones; j++ {
 		zone := "us-test-1" + string([]byte{byte('a') + byte(j)})
-		if featureflag.EnableLaunchTemplates.Enabled() {
-			expectedFilenames = append(expectedFilenames, "aws_launch_template_master-"+zone+".masters."+i.clusterName+"_user_data")
-		} else {
-			expectedFilenames = append(expectedFilenames, "aws_launch_configuration_master-"+zone+".masters."+i.clusterName+"_user_data")
-		}
+		expectedFilenames = append(expectedFilenames, "aws_launch_template_master-"+zone+".masters."+i.clusterName+"_user_data")
 	}
 
 	if i.expectPolicies {
@@ -611,12 +586,12 @@ func (i *integrationTest) runTestPhase(t *testing.T, phase cloudup.Phase) {
 		}
 	} else if phase == cloudup.PhaseCluster {
 		expectedFilenames = []string{
-			"aws_launch_configuration_nodes." + i.clusterName + "_user_data",
+			"aws_launch_template_nodes." + i.clusterName + "_user_data",
 		}
 
 		for j := 0; j < i.zones; j++ {
 			zone := "us-test-1" + string([]byte{byte('a') + byte(j)})
-			s := "aws_launch_configuration_master-" + zone + ".masters." + i.clusterName + "_user_data"
+			s := "aws_launch_template_master-" + zone + ".masters." + i.clusterName + "_user_data"
 			expectedFilenames = append(expectedFilenames, s)
 		}
 	}

pkg/featureflag/featureflag.go

@@ -52,8 +52,6 @@ var (
 	CacheNodeidentityInfo = New("CacheNodeidentityInfo", Bool(false))
 	// DNSPreCreate controls whether we pre-create DNS records.
 	DNSPreCreate = New("DNSPreCreate", Bool(true))
-	// EnableLaunchTemplates indicates we wish to switch to using launch templates rather than launchconfigurations
-	EnableLaunchTemplates = New("EnableLaunchTemplates", Bool(true))
 	//EnableExternalCloudController toggles the use of cloud-controller-manager introduced in v1.7
 	EnableExternalCloudController = New("EnableExternalCloudController", Bool(false))
 	// EnableExternalDNS enables external DNS

pkg/model/awsmodel/autoscalinggroup.go

@@ -74,14 +74,7 @@ func (b *AutoscalingGroupModelBuilder) Build(c *fi.ModelBuilderContext) error {
 		}
 
 		// @check if his instancegroup is backed by a fleet and override with a launch template
-		task, err := func() (fi.Task, error) {
-			switch UseLaunchTemplate(ig) {
-			case true:
-				return b.buildLaunchTemplateTask(c, name, ig)
-			default:
-				return b.buildLaunchConfigurationTask(c, name, ig)
-			}
-		}()
+		task, err := b.buildLaunchTemplateTask(c, name, ig)
 		if err != nil {
 			return err
 		}
@@ -92,22 +85,16 @@ func (b *AutoscalingGroupModelBuilder) Build(c *fi.ModelBuilderContext) error {
 		if err != nil {
 			return err
 		}
-		switch UseLaunchTemplate(ig) {
-		case true:
-			tsk.LaunchTemplate = task.(*awstasks.LaunchTemplate)
-		default:
-			tsk.LaunchConfiguration = task.(*awstasks.LaunchConfiguration)
-		}
+		tsk.LaunchTemplate = task
 		c.AddTask(tsk)
-
 	}
 
 	return nil
 }
 
 // buildLaunchTemplateTask is responsible for creating the template task into the aws model
 func (b *AutoscalingGroupModelBuilder) buildLaunchTemplateTask(c *fi.ModelBuilderContext, name string, ig *kops.InstanceGroup) (*awstasks.LaunchTemplate, error) {
-	lc, err := b.buildLaunchConfigurationTask(c, name, ig)
+	lc, err := b.buildLaunchTemplate(c, name, ig)
 	if err != nil {
 		return nil, err
 	}
@@ -147,7 +134,7 @@ func (b *AutoscalingGroupModelBuilder) buildLaunchTemplateTask(c *fi.ModelBuilde
 	//   You cannot use a launch template that is set to request Spot Instances (InstanceMarketOptions)
 	//   when you configure an Auto Scaling group with a mixed instances policy.
 	if ig.Spec.MixedInstancesPolicy == nil {
-		lt.SpotPrice = fi.String(lc.SpotPrice)
+		lt.SpotPrice = lc.SpotPrice
 	} else {
 		lt.SpotPrice = fi.String("")
 	}
@@ -181,7 +168,7 @@ func (b *AutoscalingGroupModelBuilder) buildLaunchTemplateTask(c *fi.ModelBuilde
 }
 
 // buildLaunchConfigurationTask is responsible for building a launch configuration task into the model
-func (b *AutoscalingGroupModelBuilder) buildLaunchConfigurationTask(c *fi.ModelBuilderContext, name string, ig *kops.InstanceGroup) (*awstasks.LaunchConfiguration, error) {
+func (b *AutoscalingGroupModelBuilder) buildLaunchTemplate(c *fi.ModelBuilderContext, name string, ig *kops.InstanceGroup) (*awstasks.LaunchTemplate, error) {
 	// @step: lets add the root volume settings
 	volumeSize, err := defaults.DefaultInstanceGroupVolumeSize(ig.Spec.Role)
 	if err != nil {
@@ -196,11 +183,6 @@ func (b *AutoscalingGroupModelBuilder) buildLaunchConfigurationTask(c *fi.ModelB
 		volumeType = DefaultLegacyVolumeType
 	}
 
-	rootVolumeDeleteOnTermination := DefaultVolumeDeleteOnTermination
-	if ig.Spec.RootVolumeDeleteOnTermination != nil {
-		rootVolumeDeleteOnTermination = fi.BoolValue(ig.Spec.RootVolumeDeleteOnTermination)
-	}
-
 	rootVolumeEncryption := DefaultVolumeEncryption
 	if ig.Spec.RootVolumeEncryption != nil {
 		rootVolumeEncryption = fi.BoolValue(ig.Spec.RootVolumeEncryption)
@@ -223,19 +205,18 @@ func (b *AutoscalingGroupModelBuilder) buildLaunchConfigurationTask(c *fi.ModelB
 		return nil, fmt.Errorf("unable to find IAM profile link for instance group %q: %w", ig.ObjectMeta.Name, err)
 	}
 
-	t := &awstasks.LaunchConfiguration{
-		Name:                          fi.String(name),
-		Lifecycle:                     b.Lifecycle,
-		IAMInstanceProfile:            link,
-		ImageID:                       fi.String(ig.Spec.Image),
-		InstanceMonitoring:            ig.Spec.DetailedInstanceMonitoring,
-		InstanceType:                  fi.String(strings.Split(ig.Spec.MachineType, ",")[0]),
-		RootVolumeDeleteOnTermination: fi.Bool(rootVolumeDeleteOnTermination),
-		RootVolumeOptimization:        ig.Spec.RootVolumeOptimization,
-		RootVolumeSize:                fi.Int64(int64(volumeSize)),
-		RootVolumeType:                fi.String(volumeType),
-		RootVolumeEncryption:          fi.Bool(rootVolumeEncryption),
-		SecurityGroups:                []*awstasks.SecurityGroup{sgLink},
+	t := &awstasks.LaunchTemplate{
+		Name:                   fi.String(name),
+		Lifecycle:              b.Lifecycle,
+		IAMInstanceProfile:     link,
+		ImageID:                fi.String(ig.Spec.Image),
+		InstanceMonitoring:     ig.Spec.DetailedInstanceMonitoring,
+		InstanceType:           fi.String(strings.Split(ig.Spec.MachineType, ",")[0]),
+		RootVolumeOptimization: ig.Spec.RootVolumeOptimization,
+		RootVolumeSize:         fi.Int64(int64(volumeSize)),
+		RootVolumeType:         fi.String(volumeType),
+		RootVolumeEncryption:   fi.Bool(rootVolumeEncryption),
+		SecurityGroups:         []*awstasks.SecurityGroup{sgLink},
 	}
 
 	t.HTTPTokens = fi.String(ec2.LaunchTemplateHttpTokensStateOptional)
@@ -343,7 +324,7 @@ func (b *AutoscalingGroupModelBuilder) buildLaunchConfigurationTask(c *fi.ModelB
 	// @step: set up instance spot pricing
 	if fi.StringValue(ig.Spec.MaxPrice) != "" {
 		spotPrice := fi.StringValue(ig.Spec.MaxPrice)
-		t.SpotPrice = spotPrice
+		t.SpotPrice = fi.String(spotPrice)
 	}
 
 	// @step: check the subnets are ok and pull together an array for us

pkg/model/awsmodel/context.go

@@ -17,26 +17,10 @@ limitations under the License.
 package awsmodel
 
 import (
-	"k8s.io/kops/pkg/apis/kops"
-	"k8s.io/kops/pkg/featureflag"
 	"k8s.io/kops/pkg/model"
 )
 
 // AWSModelContext provides the context for the aws model
 type AWSModelContext struct {
 	*model.KopsModelContext
 }
-
-// UseMixedInstancePolicies indicates if we are using mixed instance policies
-func UseMixedInstancePolicies(ig *kops.InstanceGroup) bool {
-	return ig.Spec.MixedInstancesPolicy != nil
-}
-
-// UseLaunchTemplate checks if we need to use a launch template rather than configuration
-func UseLaunchTemplate(ig *kops.InstanceGroup) bool {
-	if featureflag.EnableLaunchTemplates.Enabled() {
-		return true
-	}
-
-	return UseMixedInstancePolicies(ig)
-}