removed duplicate container defintion from neuron.yaml

aws-neuron · Dec 4, 2024 · 56e1278 · 56e1278
1 parent a7c38b9
commit 56e1278
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 20 deletions.
diff --git a/neuron-problem-detector/ecs-npd-cdk/.gitignore b/neuron-problem-detector/ecs-npd-cdk/.gitignore
@@ -1 +1,2 @@
 __pycache__/
+cdk.out/
diff --git a/neuron-problem-detector/ecs-npd-cdk/README.md b/neuron-problem-detector/ecs-npd-cdk/README.md
@@ -52,12 +52,12 @@ $ pip install -r requirements.txt
 ```
 
 ## Synthesize CloudFormation template
+It is assumed that you have authenticated successfully to connect to your AWS environment. 
 At this point you can now synthesize the CloudFormation template for this code.
 
 ```
 $ cdk synth
 ```
-It is assumed that you have authenticated successfully to connect to your AWS environment. 
 
 Perform bootstrap function with the following command.
 ```
@@ -69,6 +69,21 @@ Deploy the stack in your AWS environment
 cdk deploy [--profile <profile name>]
 ```
 
+## Cleanup Instructions
+
+Destroy the stack in your AWS environment
+
+```
+cdk destroy [--profile <profile name>]
+```
+
+Delete the following log groups in cloudwatch
+
+```
+/ecs/recovery
+/ecs/npd
+```
+
 ## Optional
 To add additional dependencies, for example other CDK libraries, just add
 them to your `setup.py` file and rerun the `pip install -r requirements.txt`

diff --git a/neuron-problem-detector/ecs-npd-cdk/neuron.yaml b/neuron-problem-detector/ecs-npd-cdk/neuron.yaml
@@ -875,7 +875,6 @@ Resources:
         - Ref: NeuronProblemDetectorTaskRole673752FB
     Metadata:
       aws:cdk:path: NeuronProblemDetectorStack/NeuronProblemDetectorTaskRole/DefaultPolicy/Resource
-  NeuronNpdAndRecoveryTaskDef7591F251:
     Type: AWS::ECS::TaskDefinition
     Properties:
       ContainerDefinitions:
@@ -986,8 +985,6 @@ Resources:
             - Ref: NeuronProblemDetectorVPCPrivateSubnet1Subnet708A0901
             - Ref: NeuronProblemDetectorVPCPrivateSubnet2Subnet3B7C3437
       SchedulingStrategy: DAEMON
-      TaskDefinition:
-        Ref: NeuronNpdAndRecoveryTaskDef7591F251
     DependsOn:
       - NeuronProblemDetectorTaskRoleDefaultPolicyCFCDEF04
       - NeuronProblemDetectorTaskRole673752FB

diff --git a/neuron-problem-detector/ecs-npd-cdk/neuron_problem_detector/ecs_task_definition.json b/neuron-problem-detector/ecs-npd-cdk/neuron_problem_detector/ecs_task_definition.json
@@ -9,9 +9,7 @@
                 {
                     "name": "npd-80-tcp",
                     "containerPort": 80,
-                    "hostPort": 80,
-                    "protocol": "tcp",
-                    "appProtocol": "http"
+                    "hostPort": 80
                 }
             ],
             "essential": true,
@@ -43,7 +41,6 @@
                 "options": {
                     "awslogs-group": "/ecs/npd",
                     "awslogs-create-group": "true",
-                    "awslogs-region": "us-west-2",
                     "awslogs-stream-prefix": "ecs"
                 },
                 "secretOptions": []
@@ -77,20 +74,12 @@
                 "options": {
                     "awslogs-create-group": "true",
                     "awslogs-group": "/ecs/recovery",
-                    "awslogs-region": "us-west-2",
                     "awslogs-stream-prefix": "ecs"
                 }
             },
             "systemControls": []
         }
     ],
-    "requiresCompatibilities": [
-        "EC2"
-    ],
     "cpu": "1024",
-    "memory": "3072",
-    "runtimePlatform": {
-        "cpuArchitecture": "X86_64",
-        "operatingSystemFamily": "LINUX"
-    }
+    "memory": "3072"
 }
diff --git a/neuron-problem-detector/ecs-npd-cdk/neuron_problem_detector/neuron_problem_detector_stack.py b/neuron-problem-detector/ecs-npd-cdk/neuron_problem_detector/neuron_problem_detector_stack.py
@@ -17,7 +17,7 @@ class NeuronProblemDetectorStack(Stack):
 
     def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
         super().__init__(scope, construct_id, **kwargs)
-        with open('ecs_task_definition.json', 'r') as f:
+        with open('neuron_problem_detector/ecs_task_definition.json', 'r') as f:
             ecs_task_definition = json.load(f)
 
         vpc = ec2.Vpc(self, "NeuronProblemDetectorVPC", max_azs=2)
@@ -121,7 +121,7 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
             image=ecs.ContainerImage.from_registry(
                 ecs_task_definition["containerDefinitions"][0]["image"]
             ),
-            entry_point=ecs_task_definition["containerDefinitions"][0]["entrypoint"],
+            entry_point=ecs_task_definition["containerDefinitions"][0]["entryPoint"],
             command=ecs_task_definition["containerDefinitions"][0]["command"],
             privileged=True,
             logging=ecs.AwsLogDriver(

diff --git a/neuron-problem-detector/ecs-npd-cdk/requirements.txt b/neuron-problem-detector/ecs-npd-cdk/requirements.txt
@@ -1,2 +1,2 @@
-aws-cdk-lib==2.152.0
+aws-cdk-lib>=2.152.0
 constructs>=10.0.0,<11.0.0