From 765f36a60a88573226b236f7e7d98f5f7ae945d2 Mon Sep 17 00:00:00 2001 From: Caden Marofke <132690522+marofke@users.noreply.github.com> Date: Tue, 5 Nov 2024 20:53:40 +0000 Subject: [PATCH] fix: Add feature flag to unblock new deployments Added the feature flag: @aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig to all example RFDK applications, as well as the integration tests. This allows deployments in fresh accounts to succeed since Launch Configurations are deprecated. Signed-off-by: Caden Marofke <132690522+marofke@users.noreply.github.com> --- .../deadline/All-In-AWS-Infrastructure-Basic/python/cdk.json | 1 + examples/deadline/All-In-AWS-Infrastructure-Basic/ts/cdk.json | 1 + .../deadline/All-In-AWS-Infrastructure-SEP/python/cdk.json | 1 + examples/deadline/All-In-AWS-Infrastructure-SEP/ts/cdk.json | 1 + examples/deadline/EC2-Image-Builder/python/cdk.json | 1 + examples/deadline/EC2-Image-Builder/ts/cdk.json | 1 + examples/deadline/Local-Zone/ts/cdk.json | 1 + integ/cdk.json | 3 ++- integ/components/_infrastructure/cdk.json | 3 ++- integ/components/deadline/deadline_01_repository/cdk.json | 3 ++- integ/components/deadline/deadline_02_renderQueue/cdk.json | 3 ++- integ/components/deadline/deadline_03_workerFleetHttp/cdk.json | 3 ++- .../components/deadline/deadline_04_workerFleetHttps/cdk.json | 3 ++- .../components/deadline/deadline_05_secretsManagement/cdk.json | 3 ++- 14 files changed, 21 insertions(+), 7 deletions(-) diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/python/cdk.json b/examples/deadline/All-In-AWS-Infrastructure-Basic/python/cdk.json index 954054a6e..3ec8bbaf9 100644 --- a/examples/deadline/All-In-AWS-Infrastructure-Basic/python/cdk.json +++ b/examples/deadline/All-In-AWS-Infrastructure-Basic/python/cdk.json @@ -1,5 +1,6 @@ { "app": "python -m package.app", "context": { + "@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true } } diff --git a/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/cdk.json b/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/cdk.json index 15a1c8fa2..5f4e04c95 100644 --- a/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/cdk.json +++ b/examples/deadline/All-In-AWS-Infrastructure-Basic/ts/cdk.json @@ -1,5 +1,6 @@ { "app": "npx ts-node bin/app.ts", "context": { + "@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true } } diff --git a/examples/deadline/All-In-AWS-Infrastructure-SEP/python/cdk.json b/examples/deadline/All-In-AWS-Infrastructure-SEP/python/cdk.json index 954054a6e..3ec8bbaf9 100644 --- a/examples/deadline/All-In-AWS-Infrastructure-SEP/python/cdk.json +++ b/examples/deadline/All-In-AWS-Infrastructure-SEP/python/cdk.json @@ -1,5 +1,6 @@ { "app": "python -m package.app", "context": { + "@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true } } diff --git a/examples/deadline/All-In-AWS-Infrastructure-SEP/ts/cdk.json b/examples/deadline/All-In-AWS-Infrastructure-SEP/ts/cdk.json index 15a1c8fa2..5f4e04c95 100644 --- a/examples/deadline/All-In-AWS-Infrastructure-SEP/ts/cdk.json +++ b/examples/deadline/All-In-AWS-Infrastructure-SEP/ts/cdk.json @@ -1,5 +1,6 @@ { "app": "npx ts-node bin/app.ts", "context": { + "@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true } } diff --git a/examples/deadline/EC2-Image-Builder/python/cdk.json b/examples/deadline/EC2-Image-Builder/python/cdk.json index 954054a6e..3ec8bbaf9 100644 --- a/examples/deadline/EC2-Image-Builder/python/cdk.json +++ b/examples/deadline/EC2-Image-Builder/python/cdk.json @@ -1,5 +1,6 @@ { "app": "python -m package.app", "context": { + "@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true } } diff --git a/examples/deadline/EC2-Image-Builder/ts/cdk.json b/examples/deadline/EC2-Image-Builder/ts/cdk.json index 15a1c8fa2..5f4e04c95 100644 --- a/examples/deadline/EC2-Image-Builder/ts/cdk.json +++ b/examples/deadline/EC2-Image-Builder/ts/cdk.json @@ -1,5 +1,6 @@ { "app": "npx ts-node bin/app.ts", "context": { + "@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true } } diff --git a/examples/deadline/Local-Zone/ts/cdk.json b/examples/deadline/Local-Zone/ts/cdk.json index 15a1c8fa2..5f4e04c95 100644 --- a/examples/deadline/Local-Zone/ts/cdk.json +++ b/examples/deadline/Local-Zone/ts/cdk.json @@ -1,5 +1,6 @@ { "app": "npx ts-node bin/app.ts", "context": { + "@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true } } diff --git a/integ/cdk.json b/integ/cdk.json index bc6417278..72cabbbeb 100644 --- a/integ/cdk.json +++ b/integ/cdk.json @@ -1,5 +1,6 @@ { "context": { - "@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": true + "@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": true, + "@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true } } diff --git a/integ/components/_infrastructure/cdk.json b/integ/components/_infrastructure/cdk.json index 9a660419b..9fcac532c 100644 --- a/integ/components/_infrastructure/cdk.json +++ b/integ/components/_infrastructure/cdk.json @@ -1,6 +1,7 @@ { "app": "npx ts-node bin/_infrastructure.ts", "context": { - "@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": true + "@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": true, + "@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true } } diff --git a/integ/components/deadline/deadline_01_repository/cdk.json b/integ/components/deadline/deadline_01_repository/cdk.json index d614577a9..845d5623e 100644 --- a/integ/components/deadline/deadline_01_repository/cdk.json +++ b/integ/components/deadline/deadline_01_repository/cdk.json @@ -1,6 +1,7 @@ { "app": "npx ts-node bin/deadline_01_repository.ts", "context": { - "@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": true + "@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": true, + "@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true } } diff --git a/integ/components/deadline/deadline_02_renderQueue/cdk.json b/integ/components/deadline/deadline_02_renderQueue/cdk.json index 61d9516d7..3b7847064 100644 --- a/integ/components/deadline/deadline_02_renderQueue/cdk.json +++ b/integ/components/deadline/deadline_02_renderQueue/cdk.json @@ -1,6 +1,7 @@ { "app": "npx ts-node bin/deadline_02_renderQueue.ts", "context": { - "@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": true + "@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": true, + "@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true } } diff --git a/integ/components/deadline/deadline_03_workerFleetHttp/cdk.json b/integ/components/deadline/deadline_03_workerFleetHttp/cdk.json index d1cf70d97..5ad58465d 100644 --- a/integ/components/deadline/deadline_03_workerFleetHttp/cdk.json +++ b/integ/components/deadline/deadline_03_workerFleetHttp/cdk.json @@ -1,6 +1,7 @@ { "app": "npx ts-node bin/deadline_03_workerFleetHttp.ts", "context": { - "@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": true + "@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": true, + "@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true } } diff --git a/integ/components/deadline/deadline_04_workerFleetHttps/cdk.json b/integ/components/deadline/deadline_04_workerFleetHttps/cdk.json index 0523a507e..0ca1709e2 100644 --- a/integ/components/deadline/deadline_04_workerFleetHttps/cdk.json +++ b/integ/components/deadline/deadline_04_workerFleetHttps/cdk.json @@ -1,6 +1,7 @@ { "app": "npx ts-node bin/deadline_04_workerFleetHttps.ts", "context": { - "@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": true + "@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": true, + "@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true } } diff --git a/integ/components/deadline/deadline_05_secretsManagement/cdk.json b/integ/components/deadline/deadline_05_secretsManagement/cdk.json index 5c94388a6..fd9a87636 100644 --- a/integ/components/deadline/deadline_05_secretsManagement/cdk.json +++ b/integ/components/deadline/deadline_05_secretsManagement/cdk.json @@ -1,6 +1,7 @@ { "app": "npx ts-node bin/deadline_05_secretsManagement.ts", "context": { - "@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": true + "@aws-cdk/aws-ec2:uniqueImdsv2TemplateName": true, + "@aws-cdk/aws-autoscaling:generateLaunchTemplateInsteadOfLaunchConfig": true } }