hako 1.8.3 → 1.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7c0c22449d4bbfeb7fd6f6e54e0696b3545047a
-  data.tar.gz: 2dbc3ea5ff6a88ff2fa993e17e355dabce67d804
+  metadata.gz: 70c493530e6b2a7355d402ae08d9305cbcdc5c89
+  data.tar.gz: fce07c67ce4a4d0c438b4ea341ae29ac72ccae7d
 SHA512:
-  metadata.gz: a01ec75ccaa500548a170b57d888d10655efc317f88b660e7fec545f4afd7cef6475e34d3643f478c42f6f98333b9b5b1e2322c979bf48f74de7695168bf7fa3
-  data.tar.gz: 98a23ca8ade1ce65ae0c81ef9bbc7daa2d01968c2c9ab9c4bb814b756086ab0379f7de2fa47e8dbfe33991a679f001cb37690ede379b2b1d1c2ccdaf0b5f2104
+  metadata.gz: 2d175b26ce5af0c9bb6b23a1a7c91d61cc44794ee9add9a8efd6a8e9a2a0ee8f8ab21a2572a184632437b1e78e6f2962532628e06af8d9a9778fdb17ddf5784b
+  data.tar.gz: 0fbfb30c8c28f6e42564765e8b49c81462729399706ba70fe8c60aaa7ac4202ae17703fad572712632f8f0842bc5e06561db50c42c04f4a52c5fb76125659c8a

data/.rubocop.yml

@@ -31,6 +31,8 @@ Style/RaiseArgs:
   EnforcedStyle: compact
 Style/SignalException:
   Enabled: false
+Style/StderrPuts:
+  Enabled: false
 Style/TrailingCommaInArguments:
   Enabled: false
 Style/TrailingCommaInLiteral:

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.8.4 (2017-11-24)
+## Improvements
+- Support `linux_parameters` option
+- S3 and SNS client now uses the same region with ECS
+
 # 1.8.3 (2017-09-25)
 ## Improvements
 - Support `extra_hosts` option

data/examples/hello-cap-add-app.yml

@@ -0,0 +1,13 @@
+scheduler:
+  type: ecs
+  region: ap-northeast-1
+  cluster: eagletmt
+  desired_count: 1
+app:
+  image: busybox
+  memory: 128
+  cpu: 256
+  command: ['echo', 'hello with SYS_RAWIO']
+  linux_parameters:
+    capabilities:
+      add: ['SYS_RAWIO']

data/hako.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'aws-sdk-cloudwatch'
   spec.add_dependency 'aws-sdk-cloudwatchlogs'
   spec.add_dependency 'aws-sdk-ec2'
-  spec.add_dependency 'aws-sdk-ecs'
+  spec.add_dependency 'aws-sdk-ecs', '>= 1.4.0'
   spec.add_dependency 'aws-sdk-elasticloadbalancing'
   spec.add_dependency 'aws-sdk-elasticloadbalancingv2'
   spec.add_dependency 'aws-sdk-s3'

data/lib/hako/container.rb

@@ -112,6 +112,36 @@ module Hako
       end
     end
 
+    # @return [Hash, nil]
+    def linux_parameters
+      if @definition.key?('linux_parameters')
+        ret = {}
+        conf = @definition['linux_parameters']
+
+        if conf.key?('capabilities')
+          cap = conf['capabilities']
+          ret[:capabilities] = {
+            add: cap.fetch('add', []),
+            drop: cap.fetch('drop', [])
+          }
+        end
+
+        if conf.key?('devices')
+          ret[:devices] = conf['devices'].map do |d|
+            {
+              host_path: d.fetch('host_path'),
+              container_path: d.fetch('container_path', nil),
+              permissions: d.fetch('permissions', [])
+            }
+          end
+        end
+
+        ret[:init_process_enabled] = conf.fetch('init_process_enabled', nil)
+
+        ret
+      end
+    end
+
     private
 
     PROVIDERS_KEY = '$providers'

data/lib/hako/schedulers/ecs.rb

@@ -513,6 +513,7 @@ module Hako
           mount_points: container.mount_points,
           command: container.command,
           privileged: container.privileged,
+          linux_parameters: container.linux_parameters,
           volumes_from: container.volumes_from,
           user: container.user,
           log_configuration: container.log_configuration,
@@ -651,7 +652,7 @@ module Hako
       # The JSON is supposed to be stored from Amazon ECS Event Stream.
       # http://docs.aws.amazon.com/AmazonECS/latest/developerguide/cloudwatch_event_stream.html
       def poll_task_status_from_s3(task)
-        s3 = Aws::S3::Client.new
+        s3 = Aws::S3::Client.new(region: @region)
         task_arn = task.task_arn
         uri = URI.parse(@oneshot_notification_prefix)
         prefix = uri.path.sub(%r{\A/}, '')
@@ -885,7 +886,7 @@ module Hako
           hako_task_id: @hako_task_id,
         )
         Hako.logger.info("Unable to start tasks. Publish message to #{@autoscaling_topic_for_oneshot}: #{message}")
-        sns_client = Aws::SNS::Client.new
+        sns_client = Aws::SNS::Client.new(region: @region)
         resp = sns_client.publish(topic_arn: @autoscaling_topic_for_oneshot, message: message)
         Hako.logger.info("Sent message_id=#{resp.message_id}")
         sleep(RUN_TASK_INTERVAL)
@@ -895,7 +896,7 @@ module Hako
       MIN_ASG_INTERVAL = 1
       MAX_ASG_INTERVAL = 120
       def try_scale_out_with_as(task_definition)
-        autoscaling = Aws::AutoScaling::Client.new
+        autoscaling = Aws::AutoScaling::Client.new(region: @region)
         interval = MIN_ASG_INTERVAL
         Hako.logger.info("Unable to start tasks. Start trying scaling out '#{@autoscaling_group_for_oneshot}'")
         loop do
@@ -997,6 +998,34 @@ module Hako
         if definition[:privileged]
           cmd << '--privileged'
         end
+        if definition[:linux_parameters]
+          if definition[:linux_parameters][:capabilities]
+            cp = definition[:linux_parameters][:capabilities]
+            %i[add drop].each do |a_or_d|
+              cp[a_or_d]&.each do |c|
+                cmd << "--cap-#{a_or_d}=#{c}"
+              end
+            end
+          end
+
+          if definition[:linux_parameters][:devices]
+            devs = definition[:linux_parameters][:devices]
+            devs.each do |dev|
+              opts = dev[:host_path]
+              opts += ":#{dev[:container_path]}" if dev[:container_path]
+              if dev[:permissions]
+                dev[:permissions].each do |permission|
+                  opts += permission[0] if %w[read write mknod].include?(permission)
+                end
+              end
+              cmd << "--device=#{opts}"
+            end
+          end
+
+          if definition[:init_process_enabled]
+            cmd << '--init'
+          end
+        end
         definition.fetch(:volumes_from).each do |volumes_from|
           p volumes_from
         end

data/lib/hako/schedulers/ecs_definition_comparator.rb

@@ -37,6 +37,7 @@ module Hako
           struct.member(:log_configuration, Schema::Nullable.new(log_configuration_schema))
           struct.member(:ulimits, Schema::Nullable.new(ulimits_schema))
           struct.member(:extra_hosts, Schema::Nullable.new(extra_hosts_schema))
+          struct.member(:linux_parameters, Schema::Nullable.new(linux_parameters_schema))
         end
       end
 
@@ -89,6 +90,33 @@ module Hako
         end
       end
 
+      def linux_parameters_schema
+        Schema::Structure.new.tap do |struct|
+          struct.member(:capabilities, Schema::Nullable.new(capabilities_schema))
+          struct.member(:devices, Schema::Nullable.new(devices_schema))
+          struct.member(:init_process_enabled, Schema::Nullable.new(Schema::Boolean.new))
+        end
+      end
+
+      def capabilities_schema
+        Schema::Structure.new.tap do |struct|
+          struct.member(:add, Schema::UnorderedArray.new(Schema::String.new))
+          struct.member(:drop, Schema::UnorderedArray.new(Schema::String.new))
+        end
+      end
+
+      def devices_schema
+        Schema::UnorderedArray.new(device_schema)
+      end
+
+      def device_schema
+        Schema::Structure.new.tap do |struct|
+          struct.member(:host_path, Schema::String.new)
+          struct.member(:container_path, Schema::Nullable.new(Schema::String.new))
+          struct.member(:permissions, Schema::UnorderedArray.new(Schema::String.new))
+        end
+      end
+
       def extra_hosts_schema
         Schema::UnorderedArray.new(extra_host_schema)
       end

data/lib/hako/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.4
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-25 00:00:00.000000000 Z
+date: 2017-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-applicationautoscaling
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-elasticloadbalancing
   requirement: !ruby/object:Gem::Requirement
@@ -275,6 +275,7 @@ files:
 - examples/hello-autoscaling-group.yml
 - examples/hello-autoscaling.yml
 - examples/hello-awslogs-driver.yml
+- examples/hello-cap-add-app.yml
 - examples/hello-lb-v2.yml
 - examples/hello-lb.yml
 - examples/hello-nofront.yml