ufo 4.5.4 → 4.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66df80258881426de197903fb8f5fb1e6105d688f2cde690b98884f060ea134b
-  data.tar.gz: c4032f3c68551d0ba3436953ee001b71fa5a629d62d8684b01a9d2b1f170d87a
+  metadata.gz: d86ea7d84ac2ec056ffd1993b8c83c01fe3c9caea66ec44204efbb70cffb25cb
+  data.tar.gz: 29aba82ec174765fe0d948b2fc5a313065416f9ea0178af90366b8dc769cd2f5
 SHA512:
-  metadata.gz: def48872244ef871377f433b4bb56fdea3bcf0a1e9475a714439b2f566af64644d0eee8f2b81a4c0b54049467db24cd3ae1e37d99d01f85e2a4c64a5c8061d8d
-  data.tar.gz: 686dcad5e51f5b9d62308e44dc1c9ebec202c4607389564d2764a6b37ddb56cdff776e8fef8e87f421fdd532865f4ca1dced624e36158ed273027e7b63e0d7ec
+  metadata.gz: 016d61a18190e0daa866ed7bdf3613d6a0561c6a5221f20348e9dba34797f034882fb1b89af486d5c009068446aa512092596c73b611c88a0a9a3bf8552a8f13
+  data.tar.gz: a2f20498236dc2c205fef1d071a4e766e04e14aa0f2b5f8ac7a76c1676e4b299e70eaae8b3d1e55c83ecc6a5d60ae84213d9449915d773e6850ddb83baa6910b

data/CHANGELOG.md

@@ -3,9 +3,13 @@
 All notable changes to this project will be documented in this file.
 This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [4.5.5]
+- adjust default health check thresholds in skeleton
+- improve error handling for UPDATE\_ROLLBACK\_FAILED state
+
 ## [4.5.4]
-- Merge pull request #85 `ufo docker compile` command. ability to compile Dockerfile from Dockerfile.erb w/o building
-- Merge pull request #86 slight improvement to `ufo docker compile`
+- #85 `ufo docker compile` command. ability to compile Dockerfile from Dockerfile.erb w/o building
+- #86 slight improvement to `ufo docker compile`
 
 ## [4.5.3]
 - fix error exit code when unable to find task definition

data/docs/_docs/extras/ecs-network-mode.md

@@ -3,15 +3,25 @@ title: ECS Network Mode
 nav_order: 26
 ---
 
-## Pros and Cons: awsvpc vs bridge network mode
+## Pros and Cons: bridge network mode
 
 With network bridge mode, the Docker containers of multiple services share the EC2 container instance's security group. So you have less granular control over opening ports for specific services only. For example, let’s say service A and B both are configured use bridge network mode. If you open up port 3000 for service A, it will also open up port 3000 for service B because they use the same security group at the EC2 instance level.
 
 One advantage of bridge mode is you can use dynamic port mapping and do not have to worry about network card limits.
 
-With awsvpc network mode, you must consider the limit of ethernet cards for the instance type. The table that lists the limits are under section the aws EC2 docs under [IP Addresses Per Network Interface Per Instance Type](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html) For example, a t2.large instance has a limit of 3 ethernet cards. This means, at most, you can run 3 ECS tasks on that instance in awsvpc network mode.  The network card limit ranges from 3 to 15 ethernet cards depending on the instance type.
+## Pros and Cons: awsvpc mode
 
-The advantage of awsvpc mode is that since the ECS task has its own network card and security group, there’s more granular control of the permissions per ECS service. For example, when service A and B are using awsvpc mode, they can have different security groups associated with them. In this mode, ufo creates a security group and sets up the permissions so the load balancer can talk to the containers.  You can also add additional security group to the `.ufo/settings/network/default.yml` config.
+With awsvpc network mode, you must consider the limit of ethernet cards for the instance type. If the instance supports ENI Trunking, then this is limit is decently large. However, if the instance does not support ENI Trunking, then the ENI limit is rather small.
+
+For ENI Trunking Task limits per instance: [Elastic Network Interface Trunking](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/container-instance-eni.html)
+
+For example, a m5.large instance has a limit of 10 tasks per instance.
+For EC2 instances that do not support ENI Trunking,
+the table that lists the limits are under section the aws EC2 docs under [IP Addresses Per Network Interface Per Instance Type](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html)
+
+For example, a t3.small instance has a limit of 3 ethernet cards. This means, at most, you can run 2 ECS tasks on that instance in awsvpc network mode, since one network card is already used by the host.
+
+In awsvpc mode, each ECS task gets its own network card. The advantage is there’s more granular control of the permissions per ECS service. For example, when service A and B are using awsvpc mode, they can have different security groups associated with them. In this mode, ufo creates a security group and sets up the permissions so the load balancer can talk to the containers.  You can also add additional security groups to the `.ufo/settings/network/default.yml` config.
 
 The following table summarizes the pros and cons:
 
@@ -20,4 +30,8 @@ Network mode | Pros | Cons
 bridge | The numbers of containers you can run will not be limited due to EC2 instance network cards limits. | Less fine grain security control over security group permissions with multiple ECS services.
 awsvpc | Fine grain security group permissions for each ECS service. | The number of containers can be limited by the number of network cards the EC2 instance type supports.
 
+## Recommendation
+
+It is generally recommended to use awsvpc mode with ENI trunking supported instances. You get the best of both worlds in this situation: a strong security posture as well as container density.
+
 {% include prev_next.md %}

data/docs/_docs/ufo-env-extra.md

@@ -3,6 +3,8 @@ title: UFO_ENV_EXTRA
 nav_order: 21
 ---
 
+<div class="video-box"><div class="video-container"><iframe src="https://www.youtube.com/embed/UVQuwQGToYE" frameborder="0" allowfullscreen=""></iframe></div></div>
+
 Ufo has an concept of extra environments. This is controlled by the `UFO_ENV_EXTRA` variable.  By setting `UFO_ENV_EXTRA` you can create additional identical ECS services or environments.
 
     ufo ship demo-web # creates a demo-web ecs service

data/lib/template/.ufo/settings/cfn/default.yml.tt

@@ -19,10 +19,11 @@ target_group:
                   # so we can keep this commented out, unless we need HTTPS at the app level
   # Health check settings are supported by application load balancer only:
   # health_check_path: /upcheck
-  # health_check_interval_seconds: 30 # 10 or 30 for network ELB
+  health_check_interval_seconds: 10 # default: 30. Network ELB can only take 10 or 30
+  healthy_threshold_count: 2
+  unhealthy_threshold_count: 2 # default: 10
   # health_check_protocol: HTTP # HTTP or HTTPS
   # health_check_port: traffic-port
-  # unhealthy_threshold_count: 10
   target_group_attributes:
   - key: deregistration_delay.timeout_seconds
     value: 10

data/lib/ufo/stack.rb

@@ -185,7 +185,11 @@ module Ufo
     def handle_stack_error(e)
       case e.message
       when /state and can not be updated/
-        puts "The #{@stack_name} stack is in #{"ROLLBACK_COMPLETE".color(:red)} and cannot be updated. Deleted the stack and try again."
+        puts "The #{@stack_name} stack is in a state that cannot be updated. Deleted the stack and try again."
+        puts "ERROR: #{e.message}"
+        if message.include?('UPDATE_ROLLBACK_FAILED')
+          puts "You might be able to do a 'Continue Update Rollback' and skip some resources to get the stack back into a good state."
+        end
         region = `aws configure get region`.strip rescue 'us-east-1'
         url = "https://console.aws.amazon.com/cloudformation/home?region=#{region}"
         puts "Here's the CloudFormation console url: #{url}"
@@ -203,7 +207,7 @@ module Ufo
     end
 
     def updatable?(stack)
-      stack.stack_status =~ /_COMPLETE$/
+      stack.stack_status =~ /_COMPLETE$/ || stack.stack_status == 'UPDATE_ROLLBACK_FAILED'
     end
   end
 end

data/lib/ufo/version.rb

@@ -1,3 +1,3 @@
 module Ufo
-  VERSION = "4.5.4"
+  VERSION = "4.5.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ufo
 version: !ruby/object:Gem::Version
-  version: 4.5.4
+  version: 4.5.5
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-12 00:00:00.000000000 Z
+date: 2019-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudformation