hako 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0e76021c2188815543806a45d895faefe103cf3
-  data.tar.gz: 901f08bf7cdc58f315e5da314406a0e6637e8d59
+  metadata.gz: 8c72d876a8523117cb28e9b64938792732d01991
+  data.tar.gz: 49c8f8baab9ce2b173296c79d6327cee0abfca16
 SHA512:
-  metadata.gz: 3f45ff523f92db022cf67fd8bc531ccda88d54fa2c98b2e051a3a6c3c9224a735a0edfb41ce1d1656a7f4059e6d7697a4fe76b21bee267340115f2fa24505a75
-  data.tar.gz: e4656997f0aea4ffa8388d54a937d7457aefbfdf74d054f6aa278c30f2a69360b788029ddfb742d3826af69d7176292a42c21ee25462dbcf1e32168de5903eb5
+  metadata.gz: 03605a8ac2a59471ecf74c9f08f06fc62c84c3188adac5804d3b7001d742619dd1c0379a230f3fc1aa98b37238b6ff6cb788efe16a56f78b83384d0a2885a1af
+  data.tar.gz: eb370ef4164435c9f580080106f2af47ca2b5d93aad987dedf027a53e55995ede062a54dff8181a1fcba8216a94e0283d5f3a927d58d5ae640c9c7648639569f

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.8.1 (2017-09-15)
+## Improvements
+- Add container_name and container_port option to elb and elb_v2
+    - See [examples/hello-nofront.yml](examples/hello-nofront.yml)
+
 # 1.8.0 (2017-09-15)
 ## Changes
 - Migrate to aws-sdk v3

data/examples/hello-nofront.yml

@@ -0,0 +1,44 @@
+scheduler:
+  type: ecs
+  region: ap-northeast-1
+  cluster: eagletmt
+  desired_count: 2
+  role: ecsServiceRole
+  elb_v2:
+    # VPC id where the target group is located
+    vpc_id: vpc-WWWWWWWW
+    # Health check path of the target group
+    health_check_path: /site/sha
+    listeners:
+      - port: 80
+        protocol: HTTP
+      - port: 443
+        protocol: HTTPS
+        certificate_arn: arn:aws:iam::012345678901:server-certificate/hello-lb-v2.example.com
+    subnets:
+      - subnet-XXXXXXXX
+      - subnet-YYYYYYYY
+    security_groups:
+      - sg-ZZZZZZZZ
+    load_balancer_attributes:
+      access_logs.s3.enabled: 'true'
+      access_logs.s3.bucket: hako-access-logs
+      access_logs.s3.prefix: hako-hello-lb-v2
+    # Connect ELB to app container
+    container_name: app
+    container_port: 3000
+app:
+  image: ryotarai/hello-sinatra
+  memory: 128
+  cpu: 256
+  env:
+    $providers:
+      - type: file
+        path: hello.env
+    PORT: '3000'
+    MESSAGE: '#{username}-san'
+  # Add port mapping to connect to ELB
+  port_mappings:
+    - container_port: 3000
+      host_port: 0
+      protocol: tcp

data/lib/hako/schedulers/ecs.rb

@@ -742,9 +742,7 @@ module Hako
         }
         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),
-          ]
+          params[:load_balancers] = [ecs_elb_client.load_balancer_params_for_service]
         end
         ecs_client.create_service(params).service
       end

data/lib/hako/schedulers/ecs_elb.rb

@@ -104,7 +104,11 @@ module Hako
 
       # @return [Hash]
       def load_balancer_params_for_service
-        { load_balancer_name: name }
+        {
+          load_balancer_name: name,
+          container_name: @elb_config.fetch('container_name', 'front'),
+          container_port: @elb_config.fetch('container_port', 80),
+        }
       end
     end
   end

data/lib/hako/schedulers/ecs_elb_v2.rb

@@ -155,7 +155,11 @@ module Hako
 
       # @return [Hash]
       def load_balancer_params_for_service
-        { target_group_arn: describe_target_group.target_group_arn }
+        {
+          target_group_arn: describe_target_group.target_group_arn,
+          container_name: @elb_v2_config.fetch('container_name', 'front'),
+          container_port: @elb_v2_config.fetch('container_port', 80),
+        }
       end
 
       private

data/lib/hako/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Kohei Suzuki
@@ -277,6 +277,7 @@ files:
 - examples/hello-awslogs-driver.yml
 - examples/hello-lb-v2.yml
 - examples/hello-lb.yml
+- examples/hello-nofront.yml
 - examples/hello-privileged-app.yml
 - examples/hello.env
 - examples/hello.yml