hako 0.23.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23c0c6350f347bcf8bc3a4462c6284e2d3135f22
-  data.tar.gz: 9ddd98e7ce10875ac654fcc2c425de3264d392e4
+  metadata.gz: ef29ede6ffaf4f044b5b8af2d45e0d737faacd9b
+  data.tar.gz: ac44a0612a7188db235ea9dffd9c8e54f93616f2
 SHA512:
-  metadata.gz: 1597dd9361d1ec0fbee733dc89f18a1856a0c49527a0b5b55a5982c31520c9d9483ba42fcbb36df9dbf3a81789d32c2336cf3e0f38dd7bf4c670b39dc7582821
-  data.tar.gz: a0dba22ad43958e5092b3a130fcb5a53d01328418feec37d57edbeef41b95f2350fe8577e1789d30c6a58dcfda8bdedc0a23de0ea66b0525a5f898763c22becc
+  metadata.gz: e4ddcc37c95d87a0620240b00ebb90822c1f2115233aaf24b3afc929fb07f0e3e9868b64f8e5f241e44ba888ef6954e52fef20ba0f15ce4daa18ee47f1b28234
+  data.tar.gz: 5f11ebc2a746ea818cdb5fb8899ecd53ffaef6913b8acf3e95e2b215b96e841425a66fc7638ac8e3651b1f149000dd6540bf5f28e168c590ac5322df9c47939d

data/.travis.yml

@@ -1,9 +1,11 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.3.1
+  - 2.3.3
+  - 2.4.0
   - ruby-head
 before_install:
+  - gem update --system # https://github.com/rubygems/rubygems/pull/1819
   - gem install bundler
 matrix:
   allow_failures:

data/README.md

@@ -47,7 +47,7 @@ Events:
   2015-10-05 13:35:53 +0900: (service hello) has reached a steady state.
   2015-10-05 13:35:14 +0900: (service hello) stopped 1 running tasks.
 
-% hako rollback examples/hello.yml  # [EXPERIMENTAL]
+% hako rollback examples/hello.yml
 I, [2016-05-02T13:07:12.679926 #10961]  INFO -- : Current task defintion is hello:29. Rolling back to arn:aws:ecs:ap-northeast-1:XXXXXXXXXXXX:task-definition/hello:28
 I, [2016-05-02T13:07:12.959116 #10961]  INFO -- : Updated service: arn:aws:ecs:ap-northeast-1:XXXXXXXXXXXX:service/hello
 I, [2016-05-02T13:08:27.280686 #10961]  INFO -- : Deployment completed

data/lib/hako/schedulers/ecs.rb

@@ -58,7 +58,7 @@ module Hako
 
         if @dry_run
           definitions.each do |d|
-            Hako.logger.info "Add container #{d}"
+            print_definition_in_cli_format(d)
           end
           if @autoscaling
             @autoscaling.apply(Aws::ECS::Types::Service.new(cluster_arn: @cluster, service_name: @app_id))
@@ -617,6 +617,7 @@ module Hako
           deployment_configuration: @deployment_configuration,
         }
         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.merge(container_name: 'front', container_port: 80),
           ]
@@ -762,6 +763,58 @@ module Hako
           required_cpu < cpu && required_memory < memory
         end
       end
+
+      # @param [Hash] definition
+      # @return [nil]
+      def print_definition_in_cli_format(definition)
+        cmd = %w[docker run]
+        cmd << '--name' << definition.fetch(:name)
+        cmd << '--cpu-shares' << definition.fetch(:cpu)
+        cmd << '--memory' << definition.fetch(:memory)
+        definition.fetch(:links).each do |link|
+          cmd << '--link' << link
+        end
+        definition.fetch(:port_mappings).each do |port_mapping|
+          cmd << '--publish' << "#{port_mapping.fetch(:host_port)}:#{port_mapping.fetch(:container_port)}"
+        end
+        definition.fetch(:docker_labels).each do |key, val|
+          if key != 'cc.wanko.hako.version'
+            cmd << '--label' << "#{key}=#{val}"
+          end
+        end
+        definition.fetch(:mount_points).each do |mount_point|
+          source_volume = mount_point.fetch(:source_volume)
+          v = @volumes[source_volume]
+          if v
+            cmd << '--volume' << "#{v.fetch('source_path')}:#{mount_point.fetch(:container_path)}#{mount_point[:read_only] ? ':ro' : ''}"
+          else
+            raise "Could not find volume #{source_volume}"
+          end
+        end
+        if definition[:privileged]
+          cmd << '--privileged'
+        end
+        definition.fetch(:volumes_from).each do |volumes_from|
+          p volumes_from
+        end
+        if definition[:user]
+          cmd << '--user' << definition[:user]
+        end
+
+        cmd << "\\\n  "
+        definition.fetch(:environment).each do |env|
+          cmd << '--env' << "#{env.fetch(:name)}=#{env.fetch(:value)}"
+          cmd << "\\\n  "
+        end
+
+        cmd << definition.fetch(:image)
+        if definition[:command]
+          cmd << "\\\n  "
+          cmd += definition[:command]
+        end
+        puts cmd.join(' ')
+        nil
+      end
     end
   end
 end

data/lib/hako/schedulers/ecs_elb.rb

@@ -61,6 +61,20 @@ module Hako
         true
       end
 
+      # @return [Types::ModifyLoadBalancerAttributesOutput, nil]
+      def modify_attributes
+        if @elb_config.key?('cross_zone_load_balancing')
+          @elb.modify_load_balancer_attributes(
+            load_balancer_name: name,
+            load_balancer_attributes: {
+              cross_zone_load_balancing: {
+                enabled: @elb_config['cross_zone_load_balancing'],
+              }
+            }
+          )
+        end
+      end
+
       # @return [nil]
       def destroy
         if exist?

data/lib/hako/schedulers/ecs_elb_v2.rb

@@ -95,6 +95,11 @@ module Hako
         true
       end
 
+      # @return [nil]
+      def modify_attributes
+        # Nothing implemented for now
+      end
+
       # @return [nil]
       def destroy
         unless @elb_v2_config

data/lib/hako/scripts/nginx_front.rb

@@ -77,7 +77,7 @@ module Hako
       # @return [Hash]
       def upload_config(front_conf)
         if @dry_run
-          Hako.logger.info "Generated configuration:\n#{front_conf}"
+          puts "#{self.class} will upload this configuration:\n#{front_conf}"
         else
           s3_client.put_object(
             body: front_conf,

data/lib/hako/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hako
-  VERSION = '0.23.0'
+  VERSION = '0.24.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-26 00:00:00.000000000 Z
+date: 2017-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Deploy Docker container