chore(eks): remove propertyOverride for nodegroup launchTemplate

[kirintwn]

Previously we use addPropertyOverride() when specifying launch template for a nodegroup:

aws-cdk/packages/@aws-cdk/aws-eks/lib/managed-nodegroup.ts

Lines 359 to 363 in e11d537

	// TODO: update this when the L1 resource spec is updated.
	resource.addPropertyOverride('LaunchTemplate', {
	Id: props.launchTemplateSpec.id,
	Version: props.launchTemplateSpec.version,
	});

This is now available on new cfn spec that cdk uses. So we can safely migrate to cfn props instead of calling addPropertyOverride().

The unit test should still covered the changes:

aws-cdk/packages/@aws-cdk/aws-eks/test/test.nodegroup.ts

Lines 565 to 643 in e11d537

	'create nodegroup correctly with launch template'(test: Test) {
	// GIVEN
	const { stack, vpc } = testFixture();
	// WHEN
	const cluster = new eks.Cluster(stack, 'Cluster', {
	vpc,
	defaultCapacity: 0,
	version: CLUSTER_VERSION,
	});
	const userData = ec2.UserData.forLinux();
	userData.addCommands(
	'set -o xtrace',
	`/etc/eks/bootstrap.sh ${cluster.clusterName}`,
	);
	const lt = new ec2.CfnLaunchTemplate(stack, 'LaunchTemplate', {
	launchTemplateData: {
	imageId: new eks.EksOptimizedImage().getImage(stack).imageId,
	instanceType: new ec2.InstanceType('t3.small').toString(),
	userData: cdk.Fn.base64(userData.render()),
	},
	});
	cluster.addNodegroupCapacity('ng-lt', {
	launchTemplateSpec: {
	id: lt.ref,
	version: lt.attrDefaultVersionNumber,
	},
	});
	// THEN
	expect(stack).to(haveResourceLike('AWS::EKS::Nodegroup', {
	LaunchTemplate: {
	Id: {
	Ref: 'LaunchTemplate',
	},
	Version: {
	'Fn::GetAtt': [
	'LaunchTemplate',
	'DefaultVersionNumber',
	],
	},
	},
	},
	));
	test.done();
	},
	'throws when both diskSize and launch template specified'(test: Test) {
	// GIVEN
	const { stack, vpc } = testFixture();
	// WHEN
	const cluster = new eks.Cluster(stack, 'Cluster', {
	vpc,
	defaultCapacity: 0,
	version: CLUSTER_VERSION,
	});
	const userData = ec2.UserData.forLinux();
	userData.addCommands(
	'set -o xtrace',
	`/etc/eks/bootstrap.sh ${cluster.clusterName}`,
	);
	const lt = new ec2.CfnLaunchTemplate(stack, 'LaunchTemplate', {
	launchTemplateData: {
	imageId: new eks.EksOptimizedImage().getImage(stack).imageId,
	instanceType: new ec2.InstanceType('t3.small').toString(),
	userData: cdk.Fn.base64(userData.render()),
	},
	});
	// THEN
	test.throws(() =>
	cluster.addNodegroupCapacity('ng-lt', {
	diskSize: 100,
	launchTemplateSpec: {
	id: lt.ref,
	version: lt.attrDefaultVersionNumber,
	},
	}), /diskSize must be specified within the launch template/);
	test.done();
	},

---

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

[gitpod-io]

[mergify]

Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

[aws-cdk-automation]

AWS CodeBuild CI Report

• CodeBuild project: AutoBuildProject89A8053A-LhjRyN9kxr8o
• Commit ID: 7cfc0cd
• Result: SUCCEEDED
• Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

[mergify]

Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).