hako 1.8.4 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 70c493530e6b2a7355d402ae08d9305cbcdc5c89
-  data.tar.gz: fce07c67ce4a4d0c438b4ea341ae29ac72ccae7d
+SHA256:
+  metadata.gz: be60277c499933be1ac03eed32027844eb410bb92d52355984833f16d19ac882
+  data.tar.gz: f07f5c690efcc8c81a1610ff9077dcf36f21cb41eb6f6ff07b475083bfbb999d
 SHA512:
-  metadata.gz: 2d175b26ce5af0c9bb6b23a1a7c91d61cc44794ee9add9a8efd6a8e9a2a0ee8f8ab21a2572a184632437b1e78e6f2962532628e06af8d9a9778fdb17ddf5784b
-  data.tar.gz: 0fbfb30c8c28f6e42564765e8b49c81462729399706ba70fe8c60aaa7ac4202ae17703fad572712632f8f0842bc5e06561db50c42c04f4a52c5fb76125659c8a
+  metadata.gz: 17b332ddc9a4f4eca98938d7e5fec30898d6b50971f6700bb5e1717a0c211b88d97ed4b5dc9c24a4d75bb4fabc27d5d1ed374b3d51410305b8e184b5250b1a1c
+  data.tar.gz: 288283a14dbed0e30066da6b1a7d4fa6568ceda09a4272981304e6b421f91c2fce8d6b67fc535e8440cfccf51852babc71b803a8a21542ed48d2a84b59cb58e1

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.9.0 (2017-12-06)
+## New features
+- Add support for awsvpc network mode
+- Add support for Fargate
+    - See [examples/hello-fargate.yml](examples/hello-fargate.yml) and [examples/hello-fargate-batch.yml](examples/hello-fargate-batch.yml)
+
 # 1.8.4 (2017-11-24)
 ## Improvements
 - Support `linux_parameters` option

data/examples/hello-fargate-batch.yml

@@ -0,0 +1,31 @@
+scheduler:
+  type: ecs
+  region: us-east-1
+  cluster: eagletmt
+  # Fargate
+  execution_role_arn: arn:aws:iam::012345678901:role/ecsTaskExecutionRole
+  cpu: '1024'
+  memory: '2048'
+  requires_compatibilities: ['FARGATE']
+  network_mode: awsvpc
+  launch_type: FARGATE
+  network_configuration:
+    awsvpc_configuration:
+      subnets:
+        - subnet-XXXXXXXX
+      security_groups: []
+      assign_public_ip: DISABLED
+
+app:
+  image: ryotarai/hello-sinatra
+  cpu: 1024
+  memory: 256
+  memory_reservation: 128
+  log_configuration:
+    log_driver: awslogs
+    options:
+      awslogs-group: /ecs/hello-fargate-batch
+      awslogs-region: us-east-1
+      awslogs-stream-prefix: ecs
+scripts:
+  - type: create_aws_cloud_watch_logs_log_group

data/examples/hello-fargate.yml

@@ -0,0 +1,68 @@
+scheduler:
+  type: ecs
+  region: us-east-1
+  cluster: eagletmt
+  desired_count: 1
+  task_role_arn: arn:aws:iam::012345678901:role/EcsDefault
+  elb_v2:
+    vpc_id: vpc-xxxxxxxx
+    health_check_path: /site/sha
+    listeners:
+      - port: 80
+        protocol: HTTP
+      - port: 443
+        protocol: HTTPS
+        certificate_arn: arn:aws:acm:us-east-1:012345678901:certificate/01234567-89ab-cdef-0123-456789abcdef
+    subnets:
+      - subnet-xxxxxxxx
+      - subnet-yyyyyyyy
+    security_groups:
+      - sg-xxxxxxxx
+    load_balancer_attributes:
+      access_logs.s3.enabled: 'true'
+      access_logs.s3.bucket: hako-access-logs
+      access_logs.s3.prefix: hako-hello-fargate
+      idle_timeout.timeout_seconds: '5'
+    target_group_attributes:
+      deregistration_delay.timeout_seconds: '20'
+  # Fargate
+  execution_role_arn: arn:aws:iam::012345678901:role/ecsTaskExecutionRole
+  cpu: '1024'
+  memory: '2048'
+  requires_compatibilities: ['FARGATE']
+  network_mode: awsvpc
+  launch_type: FARGATE
+  network_configuration:
+    awsvpc_configuration:
+      subnets:
+        - subnet-zzzzzzzz
+        - subnet-wwwwwwww
+      security_groups:
+        - sg-yyyyyyyy
+        - sg-zzzzzzzz
+      assign_public_ip: DISABLED
+app:
+  image: ryotarai/hello-sinatra
+  cpu: 128
+  memory: 256
+  env:
+    PORT: '3000'
+    MESSAGE: 'Hello, Fargate'
+  log_configuration:
+    log_driver: awslogs
+    options:
+      awslogs-group: /ecs/hello-fargate
+      awslogs-region: us-east-1
+      awslogs-stream-prefix: ecs
+additional_containers:
+  front:
+    image_tag: hako-nginx
+    log_configuration:
+      log_driver: awslogs
+      options:
+        awslogs-group: /ecs/hello-fargate
+        awslogs-region: us-east-1
+        awslogs-stream-prefix: ecs
+scripts:
+  - <<: !include front.yml
+    backend_port: 3000

data/lib/hako/schedulers/ecs.rb

@@ -37,6 +37,11 @@ module Hako
         if @ecs_elb_options && @ecs_elb_v2_options
           validation_error!('Cannot specify both elb and elb_v2')
         end
+        @network_mode = options.fetch('network_mode', nil)
+        if @network_mode == 'awsvpc' && @ecs_elb_v2_options
+          # awsvpc network mode requires ELB target group with target_type=ip
+          @ecs_elb_v2_options['target_type'] = 'ip'
+        end
         @dynamic_port_mapping = options.fetch('dynamic_port_mapping', @ecs_elb_options.nil?)
         if options.key?('autoscaling')
           @autoscaling = EcsAutoscaling.new(options.fetch('autoscaling'), dry_run: @dry_run)
@@ -53,6 +58,24 @@ module Hako
         end
         @placement_constraints = options.fetch('placement_constraints', [])
         @placement_strategy = options.fetch('placement_strategy', [])
+        @execution_role_arn = options.fetch('execution_role_arn', nil)
+        @cpu = options.fetch('cpu', nil)
+        @memory = options.fetch('memory', nil)
+        @requires_compatibilities = options.fetch('requires_compatibilities', nil)
+        @launch_type = options.fetch('launch_type', nil)
+        if options.key?('network_configuration')
+          network_configuration = options.fetch('network_configuration')
+          if network_configuration.key?('awsvpc_configuration')
+            awsvpc_configuration = network_configuration.fetch('awsvpc_configuration')
+            @network_configuration = {
+              awsvpc_configuration: {
+                subnets: awsvpc_configuration.fetch('subnets'),
+                security_groups: awsvpc_configuration.fetch('security_groups', nil),
+                assign_public_ip: awsvpc_configuration.fetch('assign_public_ip', nil),
+              },
+            }
+          end
+        end
 
         @started_at = nil
         @container_instance_arn = nil
@@ -317,7 +340,10 @@ module Hako
 
       # @return [Fixnum]
       def determine_front_port
-        if @dynamic_port_mapping
+        if @network_mode == 'awsvpc'
+          # When networkMode=awsvpc, the host ports and container ports in port mappings must match
+          return nil
+        elsif @dynamic_port_mapping
           return 0
         end
         if @dry_run
@@ -391,7 +417,26 @@ module Hako
         if desired_definitions.any? { |definition| different_definition?(definition, container_definitions.delete(definition[:name])) }
           return true
         end
-        !container_definitions.empty?
+        unless container_definitions.empty?
+          return true
+        end
+        if actual_definition.cpu != @cpu
+          return true
+        end
+        if actual_definition.memory != @memory
+          return true
+        end
+        if actual_definition.network_mode != @network_mode
+          return true
+        end
+        if actual_definition.execution_role_arn != @execution_role_arn
+          return true
+        end
+        if actual_definition.requires_compatibilities != @requires_compatibilities
+          return true
+        end
+
+        false
       end
 
       # @param [Hash<String, Hash<String, String>>] actual_volumes
@@ -428,8 +473,13 @@ module Hako
           new_task_definition = ecs_client.register_task_definition(
             family: @app_id,
             task_role_arn: @task_role_arn,
+            execution_role_arn: @execution_role_arn,
+            network_mode: @network_mode,
             container_definitions: definitions,
             volumes: volumes_definition,
+            requires_compatibilities: @requires_compatibilities,
+            cpu: @cpu,
+            memory: @memory,
           ).task_definition
           [true, new_task_definition]
         else
@@ -456,8 +506,13 @@ module Hako
               new_task_definition = ecs_client.register_task_definition(
                 family: family,
                 task_role_arn: @task_role_arn,
+                execution_role_arn: @execution_role_arn,
+                network_mode: @network_mode,
                 container_definitions: definitions,
                 volumes: volumes_definition,
+                requires_compatibilities: @requires_compatibilities,
+                cpu: @cpu,
+                memory: @memory,
               ).task_definition
               return [true, new_task_definition]
             else
@@ -543,6 +598,9 @@ module Hako
           count: 1,
           placement_constraints: @placement_constraints,
           started_by: 'hako oneshot',
+          launch_type: @launch_type,
+          platform_version: @platform_version,
+          network_configuration: @network_configuration,
         )
         result.failures.each do |failure|
           Hako.logger.error("#{failure.arn} #{failure.reason}")
@@ -715,6 +773,8 @@ module Hako
           desired_count: @desired_count,
           task_definition: task_definition_arn,
           deployment_configuration: @deployment_configuration,
+          platform_version: @platform_version,
+          network_configuration: @network_configuration,
         }
         if @autoscaling
           # Keep current desired_count if autoscaling is enabled
@@ -741,6 +801,9 @@ module Hako
           deployment_configuration: @deployment_configuration,
           placement_constraints: @placement_constraints,
           placement_strategy: @placement_strategy,
+          launch_type: @launch_type,
+          platform_version: @platform_version,
+          network_configuration: @network_configuration,
         }
         if ecs_elb_client.find_or_create_load_balancer(front_port)
           ecs_elb_client.modify_attributes

data/lib/hako/schedulers/ecs_elb_v2.rb

@@ -71,6 +71,7 @@ module Hako
             protocol: 'HTTP',
             vpc_id: @elb_v2_config.fetch('vpc_id'),
             health_check_path: @elb_v2_config.fetch('health_check_path', nil),
+            target_type: @elb_v2_config.fetch('target_type', nil),
           ).target_groups[0]
           Hako.logger.info "Created target group #{target_group.target_group_arn}"
         end

data/lib/hako/schedulers/ecs_service_comparator.rb

@@ -23,6 +23,8 @@ module Hako
           struct.member(:desired_count, Schema::Integer.new)
           struct.member(:task_definition, Schema::String.new)
           struct.member(:deployment_configuration, Schema::WithDefault.new(deployment_configuration_schema, default_configuration))
+          struct.member(:platform_version, Schema::String.new)
+          struct.member(:network_configuration, Schema::Nullable.new(network_configuration_schema))
         end
       end
 
@@ -33,6 +35,20 @@ module Hako
         end
       end
 
+      def network_configuration_schema
+        Schema::Structure.new.tap do |struct|
+          struct.member(:awsvpc_configuration, awsvpc_configuration_schema)
+        end
+      end
+
+      def awsvpc_configuration_schema
+        Schema::Structure.new.tap do |struct|
+          struct.member(:subnets, Schema::UnorderedArray.new(Schema::String.new))
+          struct.member(:security_groups, Schema::UnorderedArray.new(Schema::String.new))
+          struct.member(:assign_public_ip, Schema::String.new)
+        end
+      end
+
       def default_configuration
         {
           maximum_percent: 200,

data/lib/hako/scripts/nginx_front.rb

@@ -34,7 +34,6 @@ module Hako
           'S3_CONFIG_BUCKET' => @s3.bucket,
           'S3_CONFIG_KEY' => @s3.key(@app.id),
         )
-        front.links << link_app
       end
 
       # @param [Hash<String, Container>] containers
@@ -42,8 +41,13 @@ module Hako
       # @return [nil]
       def deploy_started(containers, front_port)
         front = containers.fetch('front')
+        if front_port.nil?
+          # Links and extraHosts are not supported when networkMode=awsvpc (i.e., --network=container).
+        else
+          front.links << link_app
+        end
         front.definition['port_mappings'] << port_mapping(front_port)
-        upload_config(generate_config)
+        upload_config(generate_config(backend_host: front_port.nil? ? 'localhost' : 'backend'))
         Hako.logger.info "Uploaded front configuration to s3://#{@s3.bucket}/#{@s3.key(@app.id)}"
       end
 
@@ -67,12 +71,12 @@ module Hako
       # @param [Fixnum] front_port
       # @return [Hash]
       def port_mapping(front_port)
-        { 'container_port' => 80, 'host_port' => front_port, 'protocol' => 'tcp' }
+        { 'container_port' => 80, 'host_port' => front_port || 80, 'protocol' => 'tcp' }
       end
 
       # @return [String]
-      def generate_config
-        Generator.new(@options).render
+      def generate_config(backend_host:)
+        Generator.new(@options, backend_host: backend_host).render
       end
 
       # @return [Hash]
@@ -95,8 +99,9 @@ module Hako
 
       class Generator
         # @param [Hash] options
-        def initialize(options)
+        def initialize(options, backend_host:)
           @options = options
+          @backend_host = backend_host
           @backend_port = options.fetch('backend_port')
         end
 
@@ -109,7 +114,7 @@ module Hako
 
         # @return [String]
         def listen_spec
-          "backend:#{@backend_port}"
+          "#{@backend_host}:#{@backend_port}"
         end
 
         # @return [String]

data/lib/hako/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Hako
-  VERSION = '1.8.4'
+  VERSION = '1.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.9.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-24 00:00:00.000000000 Z
+date: 2017-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-applicationautoscaling
@@ -276,6 +276,8 @@ files:
 - examples/hello-autoscaling.yml
 - examples/hello-awslogs-driver.yml
 - examples/hello-cap-add-app.yml
+- examples/hello-fargate-batch.yml
+- examples/hello-fargate.yml
 - examples/hello-lb-v2.yml
 - examples/hello-lb.yml
 - examples/hello-nofront.yml
@@ -346,7 +348,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Deploy Docker container