Make sure CF marks eni0 as delete_on_terminate

kubernetes · Jun 5, 2019 · 15a4570 · 15a4570
1 parent 790a582
commit 15a4570
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_cloudformation.go b/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_cloudformation.go
@@ -156,7 +156,8 @@ func (t *LaunchTemplate) RenderCloudformation(target *cloudformation.Cloudformat
 			ImageID:      image,
 			InstanceType: e.InstanceType,
 			NetworkInterfaces: []*cloudformationLaunchTemplateNetworkInterfaces{
-				{AssociatePublicIPAddress: e.AssociatePublicIP},
+				{AssociatePublicIPAddress: e.AssociatePublicIP,
+					DeleteOnTermination: fi.Bool(true)},
 			},
 		},
 	}

diff --git a/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_cloudformation_test.go b/upup/pkg/fi/cloudup/awstasks/launchtemplate_target_cloudformation_test.go
@@ -63,7 +63,8 @@ func TestLaunchTemplateCloudformationRender(t *testing.T) {
           "KeyName": "mykey",
           "NetworkInterfaces": [
             {
-              "AssociatePublicIpAddress": true
+              "AssociatePublicIpAddress": true,
+              "DeleteOnTermination": true
             }
           ],
           "Placement": [
@@ -144,7 +145,8 @@ func TestLaunchTemplateCloudformationRender(t *testing.T) {
           "KeyName": "mykey",
           "NetworkInterfaces": [
             {
-              "AssociatePublicIpAddress": true
+              "AssociatePublicIpAddress": true,
+              "DeleteOnTermination": true
             }
           ],
           "Placement": [