Merge pull request #32 from bnc-projects/add-task-healthcheck

Add task healthcheck

Author: bhavikkumar

Dockerfile

@@ -1,7 +1,9 @@
-FROM openjdk:8u171-jre-alpine3.8
+FROM openjdk:8u181-jre-slim
 
 ARG JAR_FILE
 
+RUN  apt-get update && apt-get install -y wget
+
 COPY ${JAR_FILE} app.jar
 RUN mkdir newrelic && wget https://download.newrelic.com/newrelic/java-agent/newrelic-agent/4.4.0/newrelic-agent-4.4.0.jar -O newrelic/newrelic.jar
 COPY newrelic.yml newrelic/newrelic.yml
@@ -10,5 +12,5 @@ EXPOSE 8080
 
 ENTRYPOINT exec java $JAVA_OPTS -jar app.jar
 
-HEALTHCHECK --start-period=90s \
+HEALTHCHECK --start-period=300s \
   CMD wget --quiet --tries=1 --spider --timeout=30 http://localhost:8080/actuator/health || exit 1

deployment/templates/service.yaml

@@ -15,6 +15,7 @@ Metadata:
       Parameters:
       - ContainerName
       - DesiredCount
+      - CPUReservation
       - MemoryLimit
       - MemoryReservation
       - HealthCheckGracePeriodSeconds
@@ -51,7 +52,7 @@ Parameters:
 
   HealthCheckGracePeriodSeconds:
     Type: Number
-    Default: 60
+    Default: 300
 
   TaskDeregistrationDelay:
     Type: Number
@@ -66,12 +67,20 @@ Parameters:
   SpringProfile:
     Type: String
 
+  CPUReservation:
+    Description: The number of cpu units to reserve for the container. This is only enforced when CPU cycles are constrained.
+    Type: Number
+    Default: 128
+    AllowedValues: [0, 10, 20, 32, 64, 128, 256, 512, 1024, 2048, 4096]
+
   MemoryReservation:
+    Description: The memory reservation for the task, this is the expected upper limit during normal operations.
     Type: Number
     Default: 768
     AllowedValues: [16, 32, 64, 128, 256, 512, 768, 1024, 1280, 1536, 1792, 2048, 2304, 2560, 2816, 3072, 3328, 3584, 3840, 4096]
 
   MemoryLimit:
+    Description: The memory limit for the task, when reached the task will be automatically terminated
     Type: Number
     Default: 768
     AllowedValues: [16, 32, 64, 128, 256, 512, 768, 1024, 1280, 1536, 1792, 2048, 2304, 2560, 2816, 3072, 3328, 3584, 3840, 4096]
@@ -164,8 +173,15 @@ Resources:
       - Name: !Ref ContainerName
         Image: !Join ['', ["Fn::Sub": '${AWS::AccountId}.dkr.ecr.${AWS::Region}.amazonaws.com/', "Fn::ImportValue": {"Fn::Sub":'${AWS::StackName}-RepositoryName'}, ':latest']]
         Essential: true
+        Cpu: !Ref CPUReservation
         Memory: !Ref MemoryLimit
         MemoryReservation: !Ref MemoryReservation
+        HealthCheck:
+          Command:
+            - "CMD-SHELL"
+            - "wget --quiet --tries=1 --spider --timeout=30 http://localhost:8080/actuator/health || exit 1"
+          StartPeriod: !Ref HealthCheckGracePeriodSeconds
+          Timeout: 30
         PortMappings:
         - ContainerPort: 8080
         LogConfiguration: