hako 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a314c9baebed4e29a7f3650abec5d8f988f57a54db5ba979957040a15b01ba0
-  data.tar.gz: f7221e593ed0ded7fb3b8f3f312d289da9efacb7fae79408e935d20f3badfeb9
+  metadata.gz: ff65e26d2cf4eae4e30db26a06c20b805691df1ef69b6b3f13978d556621c39b
+  data.tar.gz: f7e69c8ba3e9de134ed0392a051d58d88ee70d6876751dfb2c7e8077672587e9
 SHA512:
-  metadata.gz: 4f2507875d79feae5c66f61c9cabe735dafadf80c0395217363772c812663a8a93b73ad52219e6b19364b335ebdbfd3b6ebfe4bd86df68dd68b898b9fce774bc
-  data.tar.gz: 29d24a5c810a615d9bfff1d553d8a84ccf6bfdad33fbf24b9900841f41cb1de3afd558bda73d45c0b3fe47f6ded8e8e21a4beb22ca86f685a89d9f82a7becbd1
+  metadata.gz: f3db0f686407d5c0c5a7905b6773b642eaa60ba7ad5eef714b8047750ae31c588adc7ddd000ed80ea5c707cbd8e2380fc9ebcaedd825a341a1eb2836c1ad65e2
+  data.tar.gz: 93159fa006ba102e18b3053b9f26efa372fd04052afc2a06cf935bede3cc13c6cae569d3b197740b9c71db4d4890970a8ff88dbc2cacfc62d84f2bea2cd921eb

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 2.2.0 (2018-06-29)
+## New features
+- Add support for `scheduling_strategy` on service
+- Change existing ELB's subnets when different from definition
+## Bug fixes
+- Take task-level cpu/memory into account on scale out
+- Show `--memory-reservation` in the dry-run output
+
 # 2.1.0 (2018-04-18)
 ## New features
 - Support Network Load Balancer

data/lib/hako/schedulers/ecs.rb

@@ -59,6 +59,7 @@ module Hako
         end
         @placement_constraints = options.fetch('placement_constraints', [])
         @placement_strategy = options.fetch('placement_strategy', [])
+        @scheduling_strategy = options.fetch('scheduling_strategy', nil)
         @execution_role_arn = options.fetch('execution_role_arn', nil)
         @cpu = options.fetch('cpu', nil)
         @memory = options.fetch('memory', nil)
@@ -85,7 +86,7 @@ module Hako
       # @param [Hash<String, Container>] containers
       # @return [nil]
       def deploy(containers)
-        unless @desired_count
+        if @desired_count.nil? && @scheduling_strategy != 'DAEMON'
           validation_error!('desired_count must be set')
         end
         front_port = determine_front_port
@@ -798,16 +799,19 @@ module Hako
           cluster: @cluster,
           service_name: @app_id,
           task_definition: task_definition_arn,
-          desired_count: 0,
           role: @role,
           deployment_configuration: @deployment_configuration,
           placement_constraints: @placement_constraints,
           placement_strategy: @placement_strategy,
+          scheduling_strategy: @scheduling_strategy,
           launch_type: @launch_type,
           platform_version: @platform_version,
           network_configuration: @network_configuration,
           health_check_grace_period_seconds: @health_check_grace_period_seconds,
         }
+        if @scheduling_strategy != 'DAEMON'
+          params[:desired_count] = 0
+        end
         if ecs_elb_client.find_or_create_load_balancer(front_port)
           ecs_elb_client.modify_attributes
           params[:load_balancers] = [ecs_elb_client.load_balancer_params_for_service]
@@ -942,7 +946,10 @@ module Hako
 
       RUN_TASK_INTERVAL = 10
       def try_scale_out_with_sns(task_definition)
-        required_cpu, required_memory = task_definition.container_definitions.inject([0, 0]) { |(cpu, memory), d| [cpu + d.cpu, memory + (d.memory_reservation || d.memory)] }
+        required_cpu = task_definition.cpu && task_definition.cpu.to_i
+        required_cpu ||= task_definition.container_definitions.inject(0) { |cpu, d| cpu + d.cpu }
+        required_memory = task_definition.memory && task_definition.memory.to_i
+        required_memory ||= task_definition.container_definitions.inject(0) { |memory, d| memory + (d.memory_reservation || d.memory) }
         @hako_task_id ||= SecureRandom.uuid
         message = JSON.dump(
           group_name: @autoscaling_group_for_oneshot,
@@ -1025,7 +1032,10 @@ module Hako
       # @param [Array<Aws::ECS::Types::ContainerInstance>] container_instances
       # @return [Boolean]
       def has_capacity?(task_definition, container_instances)
-        required_cpu, required_memory = task_definition.container_definitions.inject([0, 0]) { |(cpu, memory), d| [cpu + d.cpu, memory + (d.memory_reservation || d.memory)] }
+        required_cpu = task_definition.cpu && task_definition.cpu.to_i
+        required_cpu ||= task_definition.container_definitions.inject(0) { |cpu, d| cpu + d.cpu }
+        required_memory = task_definition.memory && task_definition.memory.to_i
+        required_memory ||= task_definition.container_definitions.inject(0) { |memory, d| memory + (d.memory_reservation || d.memory) }
         container_instances.any? do |ci|
           cpu = ci.remaining_resources.find { |r| r.name == 'CPU' }.integer_value
           memory = ci.remaining_resources.find { |r| r.name == 'MEMORY' }.integer_value
@@ -1043,6 +1053,9 @@ module Hako
         if definition[:memory]
           cmd << '--memory' << "#{definition[:memory]}M"
         end
+        if definition[:memory_reservation]
+          cmd << '--memory-reservation' << "#{definition[:memory_reservation]}M"
+        end
         definition.fetch(:links).each do |link|
           cmd << '--link' << link
         end

data/lib/hako/schedulers/ecs_elb_v2.rb

@@ -130,8 +130,18 @@ module Hako
           return nil
         end
 
+        load_balancer = describe_load_balancer
+        subnets = @elb_v2_config.fetch('subnets').sort
+        if load_balancer && subnets != load_balancer.availability_zones.map(&:subnet_id).sort
+          if @dry_run
+            Hako.logger.info("elb_client.set_subnets(load_balancer_arn: #{load_balancer.load_balancer_arn}, subnets: #{subnets}) (dry-run)")
+          else
+            Hako.logger.info("Updating ELBv2 subnets to #{subnets}")
+            elb_client.set_subnets(load_balancer_arn: load_balancer.load_balancer_arn, subnets: subnets)
+          end
+        end
+
         if @elb_v2_config.key?('load_balancer_attributes')
-          load_balancer = describe_load_balancer
           attributes = @elb_v2_config.fetch('load_balancer_attributes').map { |key, value| { key: key, value: value } }
           if @dry_run
             if load_balancer

data/lib/hako/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-18 00:00:00.000000000 Z
+date: 2018-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-applicationautoscaling