Revert "fix(ecs-patterns): memory limit is not set at the container l…

…evel" (#21530) This reverts #21201 due to #21484: Recent update breaks FargateService L3 constructs which have added additional containers to the task definition Closes #21484 Re-opens #13127 ---- ### All Submissions: * [ ] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) ### Adding new Unconventional Dependencies: * [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md/#adding-new-unconventional-dependencies) ### New Features * [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/main/INTEGRATION_TESTS.md)? * [ ] Did you use `yarn integ` to deploy the infrastructure and generate the snapshot (i.e. `yarn integ` without `--dry-run`)? *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
aws · Aug 10, 2022 · 605cc62 · 605cc62
1 parent b4f9e5e
commit 605cc62
Show file tree

Hide file tree

Showing 29 changed files with 12 additions and 81 deletions.
diff --git a/packages/@aws-cdk/aws-ecs-patterns/lib/fargate/application-load-balanced-fargate-service.ts b/packages/@aws-cdk/aws-ecs-patterns/lib/fargate/application-load-balanced-fargate-service.ts
@@ -82,11 +82,9 @@ export class ApplicationLoadBalancedFargateService extends ApplicationLoadBalanc
       const containerName = taskImageOptions.containerName ?? 'web';
       const container = this.taskDefinition.addContainer(containerName, {
         image: taskImageOptions.image,
-        cpu: props.cpu,
-        memoryLimitMiB: props.memoryLimitMiB,
+        logging: logDriver,
         environment: taskImageOptions.environment,
         secrets: taskImageOptions.secrets,
-        logging: logDriver,
         dockerLabels: taskImageOptions.dockerLabels,
       });
       container.addPortMappings({

diff --git a/...ws-cdk/aws-ecs-patterns/lib/fargate/application-multiple-target-groups-fargate-service.ts b/...ws-cdk/aws-ecs-patterns/lib/fargate/application-multiple-target-groups-fargate-service.ts
@@ -74,11 +74,9 @@ export class ApplicationMultipleTargetGroupsFargateService extends ApplicationMu
       const containerName = taskImageOptions.containerName ?? 'web';
       const container = this.taskDefinition.addContainer(containerName, {
         image: taskImageOptions.image,
-        cpu: props.cpu,
-        memoryLimitMiB: props.memoryLimitMiB,
+        logging: this.logDriver,
         environment: taskImageOptions.environment,
         secrets: taskImageOptions.secrets,
-        logging: this.logDriver,
         dockerLabels: taskImageOptions.dockerLabels,
       });
       if (taskImageOptions.containerPorts) {

diff --git a/packages/@aws-cdk/aws-ecs-patterns/lib/fargate/network-load-balanced-fargate-service.ts b/packages/@aws-cdk/aws-ecs-patterns/lib/fargate/network-load-balanced-fargate-service.ts
@@ -72,11 +72,9 @@ export class NetworkLoadBalancedFargateService extends NetworkLoadBalancedServic
       const containerName = taskImageOptions.containerName ?? 'web';
       const container = this.taskDefinition.addContainer(containerName, {
         image: taskImageOptions.image,
-        cpu: props.cpu,
-        memoryLimitMiB: props.memoryLimitMiB,
+        logging: logDriver,
         environment: taskImageOptions.environment,
         secrets: taskImageOptions.secrets,
-        logging: logDriver,
         dockerLabels: taskImageOptions.dockerLabels,
       });
       container.addPortMappings({

diff --git a/...s/@aws-cdk/aws-ecs-patterns/lib/fargate/network-multiple-target-groups-fargate-service.ts b/...s/@aws-cdk/aws-ecs-patterns/lib/fargate/network-multiple-target-groups-fargate-service.ts
@@ -74,11 +74,9 @@ export class NetworkMultipleTargetGroupsFargateService extends NetworkMultipleTa
       const containerName = taskImageOptions.containerName ?? 'web';
       const container = this.taskDefinition.addContainer(containerName, {
         image: taskImageOptions.image,
-        cpu: props.cpu,
-        memoryLimitMiB: props.memoryLimitMiB,
+        logging: this.logDriver,
         environment: taskImageOptions.environment,
         secrets: taskImageOptions.secrets,
-        logging: this.logDriver,
         dockerLabels: taskImageOptions.dockerLabels,
       });
       if (taskImageOptions.containerPorts) {

diff --git a/packages/@aws-cdk/aws-ecs-patterns/lib/fargate/queue-processing-fargate-service.ts b/packages/@aws-cdk/aws-ecs-patterns/lib/fargate/queue-processing-fargate-service.ts
@@ -68,13 +68,10 @@ export class QueueProcessingFargateService extends QueueProcessingServiceBase {
   constructor(scope: Construct, id: string, props: QueueProcessingFargateServiceProps) {
     super(scope, id, props);
 
-    const cpu = props.cpu || 256;
-    const memoryLimitMiB = props.memoryLimitMiB || 512;
-
     // Create a Task Definition for the container to start
     this.taskDefinition = new FargateTaskDefinition(this, 'QueueProcessingTaskDef', {
-      cpu,
-      memoryLimitMiB,
+      memoryLimitMiB: props.memoryLimitMiB || 512,
+      cpu: props.cpu || 256,
       family: props.family,
       runtimePlatform: props.runtimePlatform,
     });
@@ -83,8 +80,6 @@ export class QueueProcessingFargateService extends QueueProcessingServiceBase {
 
     this.taskDefinition.addContainer(containerName, {
       image: props.image,
-      cpu,
-      memoryLimitMiB,
       command: props.command,
       environment: this.environment,
       secrets: this.secrets,

diff --git a/packages/@aws-cdk/aws-ecs-patterns/lib/fargate/scheduled-fargate-task.ts b/packages/@aws-cdk/aws-ecs-patterns/lib/fargate/scheduled-fargate-task.ts
@@ -73,18 +73,12 @@ export class ScheduledFargateTask extends ScheduledTaskBase {
       this.taskDefinition = props.scheduledFargateTaskDefinitionOptions.taskDefinition;
     } else if (props.scheduledFargateTaskImageOptions) {
       const taskImageOptions = props.scheduledFargateTaskImageOptions;
-      const cpu = taskImageOptions.cpu || 256;
-      const memoryLimitMiB = taskImageOptions.memoryLimitMiB || 512;
-
       this.taskDefinition = new FargateTaskDefinition(this, 'ScheduledTaskDef', {
-        memoryLimitMiB,
-        cpu,
-        runtimePlatform: props.runtimePlatform,
+        memoryLimitMiB: taskImageOptions.memoryLimitMiB || 512,
+        cpu: taskImageOptions.cpu || 256,
       });
       this.taskDefinition.addContainer('ScheduledContainer', {
         image: taskImageOptions.image,
-        memoryLimitMiB,
-        cpu,
         command: taskImageOptions.command,
         environment: taskImageOptions.environment,
         secrets: taskImageOptions.secrets,

diff --git a/packages/@aws-cdk/aws-ecs-patterns/test/ec2/l3s.test.ts b/packages/@aws-cdk/aws-ecs-patterns/test/ec2/l3s.test.ts
@@ -500,8 +500,6 @@ test('test Fargate loadbalanced construct', () => {
   // WHEN
   new ecsPatterns.ApplicationLoadBalancedFargateService(stack, 'Service', {
     cluster,
-    cpu: 1024,
-    memoryLimitMiB: 2048,
     taskImageOptions: {
       image: ecs.ContainerImage.fromRegistry('test'),
       environment: {
@@ -518,11 +516,6 @@ test('test Fargate loadbalanced construct', () => {
   Template.fromStack(stack).hasResourceProperties('AWS::ECS::TaskDefinition', {
     ContainerDefinitions: [
       Match.objectLike({
-        Cpu: 1024,
-        DockerLabels: {
-          label1: 'labelValue1',
-          label2: 'labelValue2',
-        },
         Environment: [
           {
             Name: 'TEST_ENVIRONMENT_VARIABLE1',
@@ -533,7 +526,6 @@ test('test Fargate loadbalanced construct', () => {
             Value: 'test environment variable 2 value',
           },
         ],
-        Image: 'test',
         LogConfiguration: {
           LogDriver: 'awslogs',
           Options: {
@@ -542,11 +534,12 @@ test('test Fargate loadbalanced construct', () => {
             'awslogs-region': { Ref: 'AWS::Region' },
           },
         },
-        Memory: 2048,
+        DockerLabels: {
+          label1: 'labelValue1',
+          label2: 'labelValue2',
+        },
       }),
     ],
-    Cpu: '1024',
-    Memory: '2048',
   });
 
   Template.fromStack(stack).hasResourceProperties('AWS::ECS::Service', {

diff --git a/...-service-https-idle-timeout.integ.snapshot/aws-ecs-integ-alb-fg-idletimeout.template.json b/...-service-https-idle-timeout.integ.snapshot/aws-ecs-integ-alb-fg-idletimeout.template.json
@@ -640,7 +640,6 @@
         }
        }
       },
-      "Memory": 512,
       "Name": "web",
       "PortMappings": [
        {

diff --git a/...ecs-patterns/test/fargate/alb-fargate-service-https-idle-timeout.integ.snapshot/tree.json b/...ecs-patterns/test/fargate/alb-fargate-service-https-idle-timeout.integ.snapshot/tree.json
@@ -1124,7 +1124,6 @@
                           {
                             "essential": true,
                             "image": "amazon/amazon-ecs-sample",
-                            "memory": 512,
                             "name": "web",
                             "portMappings": [
                               {

diff --git a/...fargate/alb-fargate-service-https.integ.snapshot/aws-ecs-integ-alb-fg-https.template.json b/...fargate/alb-fargate-service-https.integ.snapshot/aws-ecs-integ-alb-fg-https.template.json
@@ -636,7 +636,6 @@
         }
        }
       },
-      "Memory": 512,
       "Name": "web",
       "PortMappings": [
        {

diff --git a/.../circuit-breaker-load-balanced-fargate-service.integ.snapshot/aws-ecs-integ.template.json b/.../circuit-breaker-load-balanced-fargate-service.integ.snapshot/aws-ecs-integ.template.json
@@ -529,7 +529,6 @@
         }
        }
       },
-      "Memory": 512,
       "Name": "web",
       "PortMappings": [
        {

diff --git a/...aker-queue-processing-fargate-service.integ.snapshot/aws-ecs-patterns-queue.template.json b/...aker-queue-processing-fargate-service.integ.snapshot/aws-ecs-patterns-queue.template.json
@@ -461,7 +461,6 @@
    "Properties": {
     "ContainerDefinitions": [
      {
-      "Cpu": 256,
       "Environment": [
        {
         "Name": "QUEUE_NAME",
@@ -505,7 +504,6 @@
         }
        }
       },
-      "Memory": 512,
       "Name": "QueueProcessingContainer"
      }
     ],

diff --git a/...dk/aws-ecs-patterns/test/fargate/executionrole.integ.snapshot/aws-ecs-integ.template.json b/...dk/aws-ecs-patterns/test/fargate/executionrole.integ.snapshot/aws-ecs-integ.template.json
@@ -564,7 +564,6 @@
    "Properties": {
     "ContainerDefinitions": [
      {
-      "Cpu": 512,
       "Essential": true,
       "Image": "amazon/amazon-ecs-sample",
       "LogConfiguration": {
@@ -579,7 +578,6 @@
         }
        }
       },
-      "Memory": 1024,
       "Name": "web",
       "PortMappings": [
        {

diff --git a/...iple-application-load-balanced-fargate-service.integ.snapshot/aws-ecs-integ.template.json b/...iple-application-load-balanced-fargate-service.integ.snapshot/aws-ecs-integ.template.json
@@ -654,7 +654,6 @@
         }
        }
       },
-      "Memory": 512,
       "Name": "web",
       "PortMappings": [
        {

diff --git a/.../healthchecks-multiple-application-load-balanced-fargate-service.integ.snapshot/tree.json b/.../healthchecks-multiple-application-load-balanced-fargate-service.integ.snapshot/tree.json
@@ -1150,7 +1150,6 @@
                           {
                             "essential": true,
                             "image": "amazon/amazon-ecs-sample",
-                            "memory": 512,
                             "name": "web",
                             "portMappings": [
                               {

diff --git a/...multiple-network-load-balanced-fargate-service.integ.snapshot/aws-ecs-integ.template.json b/...multiple-network-load-balanced-fargate-service.integ.snapshot/aws-ecs-integ.template.json
@@ -532,7 +532,6 @@
         }
        }
       },
-      "Memory": 512,
       "Name": "web",
       "PortMappings": [
        {

diff --git a/...gate/healthchecks-multiple-network-load-balanced-fargate-service.integ.snapshot/tree.json b/...gate/healthchecks-multiple-network-load-balanced-fargate-service.integ.snapshot/tree.json
@@ -960,7 +960,6 @@
                           {
                             "essential": true,
                             "image": "amazon/amazon-ecs-sample",
-                            "memory": 512,
                             "name": "web",
                             "portMappings": [
                               {

diff --git a/...terns/test/fargate/l3-autocreate.integ.snapshot/aws-ecs-integ-l3-autocreate.template.json b/...terns/test/fargate/l3-autocreate.integ.snapshot/aws-ecs-integ-l3-autocreate.template.json
@@ -129,7 +129,6 @@
    "Properties": {
     "ContainerDefinitions": [
      {
-      "Cpu": 512,
       "Essential": true,
       "Image": "amazon/amazon-ecs-sample",
       "LogConfiguration": {
@@ -144,7 +143,6 @@
         }
        }
       },
-      "Memory": 1024,
       "Name": "web",
       "PortMappings": [
        {
@@ -777,7 +775,6 @@
    "Properties": {
     "ContainerDefinitions": [
      {
-      "Cpu": 512,
       "Essential": true,
       "Image": "amazon/amazon-ecs-sample",
       "LogConfiguration": {
@@ -792,7 +789,6 @@
         }
        }
       },
-      "Memory": 1024,
       "Name": "web",
       "PortMappings": [
        {

diff --git a/...ate/l3-capacity-provider-strategies.integ.snapshot/aws-ecs-integ-lb-fargate.template.json b/...ate/l3-capacity-provider-strategies.integ.snapshot/aws-ecs-integ-lb-fargate.template.json
@@ -528,7 +528,6 @@
    "Properties": {
     "ContainerDefinitions": [
      {
-      "Cpu": 512,
       "Essential": true,
       "Image": "amazon/amazon-ecs-sample",
       "LogConfiguration": {
@@ -543,7 +542,6 @@
         }
        }
       },
-      "Memory": 1024,
       "Name": "web",
       "PortMappings": [
        {
@@ -801,7 +799,6 @@
    "Properties": {
     "ContainerDefinitions": [
      {
-      "Cpu": 512,
       "Essential": true,
       "Image": "amazon/amazon-ecs-sample",
       "LogConfiguration": {
@@ -816,7 +813,6 @@
         }
        }
       },
-      "Memory": 1024,
       "Name": "web",
       "PortMappings": [
        {

diff --git a/...cs-patterns/test/fargate/l3-vpconly.integ.snapshot/aws-ecs-integ-l3-vpconly.template.json b/...cs-patterns/test/fargate/l3-vpconly.integ.snapshot/aws-ecs-integ-l3-vpconly.template.json
@@ -512,7 +512,6 @@
    "Properties": {
     "ContainerDefinitions": [
      {
-      "Cpu": 512,
       "Essential": true,
       "Image": "amazon/amazon-ecs-sample",
       "LogConfiguration": {
@@ -527,7 +526,6 @@
         }
        }
       },
-      "Memory": 1024,
       "Name": "web",
       "PortMappings": [
        {
@@ -777,7 +775,6 @@
    "Properties": {
     "ContainerDefinitions": [
      {
-      "Cpu": 512,
       "Essential": true,
       "Image": "amazon/amazon-ecs-sample",
       "LogConfiguration": {
@@ -792,7 +789,6 @@
         }
        }
       },
-      "Memory": 1024,
       "Name": "web",
       "PortMappings": [
        {

diff --git a/...dk/aws-ecs-patterns/test/fargate/l3.integ.snapshot/aws-ecs-integ-lb-fargate.template.json b/...dk/aws-ecs-patterns/test/fargate/l3.integ.snapshot/aws-ecs-integ-lb-fargate.template.json
@@ -515,7 +515,6 @@
    "Properties": {
     "ContainerDefinitions": [
      {
-      "Cpu": 512,
       "Essential": true,
       "Image": "amazon/amazon-ecs-sample",
       "LogConfiguration": {
@@ -530,7 +529,6 @@
         }
        }
       },
-      "Memory": 1024,
       "Name": "web",
       "PortMappings": [
        {
@@ -777,7 +775,6 @@
    "Properties": {
     "ContainerDefinitions": [
      {
-      "Cpu": 512,
       "Essential": true,
       "Image": "amazon/amazon-ecs-sample",
       "LogConfiguration": {
@@ -792,7 +789,6 @@
         }
        }
       },
-      "Memory": 1024,
       "Name": "web",
       "PortMappings": [
        {

diff --git a/...multiple-network-load-balanced-fargate-service.integ.snapshot/aws-ecs-integ.template.json b/...multiple-network-load-balanced-fargate-service.integ.snapshot/aws-ecs-integ.template.json
@@ -530,7 +530,6 @@
         }
        }
       },
-      "Memory": 512,
       "Name": "web",
       "PortMappings": [
        {

diff --git a/...ing-fargate-service-isolated.integ.snapshot/aws-ecs-patterns-queue-isolated.template.json b/...ing-fargate-service-isolated.integ.snapshot/aws-ecs-patterns-queue-isolated.template.json
@@ -770,7 +770,6 @@
    "Properties": {
     "ContainerDefinitions": [
      {
-      "Cpu": 256,
       "Environment": [
        {
         "Name": "QUEUE_NAME",
@@ -814,7 +813,6 @@
         }
        }
       },
-      "Memory": 512,
       "Name": "QueueProcessingContainer"
      }
     ],
-Original file line number
+Diff line change
@@ Expand Up / @@ -640,7 +640,6 @@ @@
             }
            }
           },
-          "Memory": 512,
           "Name": "web",
           "PortMappings": [
            {
@@ Expand Down @@