hako 2.2.0 → 2.3.0

data/examples/hello-lb-v2.jsonnet

@@ -2,70 +2,70 @@ local fileProvider = std.native('provide.file');
 local provide(name) = fileProvider(std.toString({ path: 'hello.env' }), name);
 
 {
-    scheduler: {
-        type: 'ecs',
-        region: 'ap-northeast-1',
-        cluster: 'eagletmt',
-        desired_count: 2,
-        role: 'ecsServiceRole',
-        // dynamic_port_mapping is enabled by default with elb_v2
-        // dynamic_port_mapping: false,
-        // health_check_grace_period_seconds: 0,
-        elb_v2: {
-            // VPC id where the target group is located
-            vpc_id: 'vpc-WWWWWWWW',
-            // If you want internal ELB, then use 'scheme'. (ex. internal service that like microservice inside VPC)
-            // scheme: internal
-            // 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',
-            },
-            target_group_attributes: {
-                // http://docs.aws.amazon.com/en_us/elasticloadbalancing/latest/application/load-balancer-target-groups.html#target-group-attributes
-                'deregistration_delay.timeout_seconds': '20',
-            },
+  scheduler: {
+    type: 'ecs',
+    region: 'ap-northeast-1',
+    cluster: 'eagletmt',
+    desired_count: 2,
+    role: 'ecsServiceRole',
+    // dynamic_port_mapping is enabled by default with elb_v2
+    // dynamic_port_mapping: false,
+    // health_check_grace_period_seconds: 0,
+    elb_v2: {
+      // VPC id where the target group is located
+      vpc_id: 'vpc-WWWWWWWW',
+      // If you want internal ELB, then use 'scheme'. (ex. internal service that like microservice inside VPC)
+      // scheme: internal
+      // Health check path of the target group
+      health_check_path: '/site/sha',
+      listeners: [
+        {
+          port: 80,
+          protocol: 'HTTP',
         },
-    },
-    app: {
-        image: 'ryotarai/hello-sinatra',
-        memory: 128,
-        cpu: 256,
-        env: {
-            PORT: '3000',
-            MESSAGE: std.format('%s-san', provide('username')),
+        {
+          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',
+      },
+      target_group_attributes: {
+        // http://docs.aws.amazon.com/en_us/elasticloadbalancing/latest/application/load-balancer-target-groups.html#target-group-attributes
+        'deregistration_delay.timeout_seconds': '20',
+      },
     },
-    additional_containers: {
-        front: {
-            image_tag: 'hako-nginx',
-            memory: 32,
-            cpu: 32,
-        },
+  },
+  app: {
+    image: 'ryotarai/hello-sinatra',
+    memory: 128,
+    cpu: 256,
+    env: {
+      PORT: '3000',
+      MESSAGE: std.format('%s-san', provide('username')),
     },
-    scripts: [
-        (import 'front.libsonnet') + {
-            backend_port: 3000,
-            locations: {
-                '/': {
-                    allow_only_from: ['10.0.0.0/24'],
-                },
-            },
+  },
+  sidecars: {
+    front: {
+      image_tag: 'hako-nginx',
+      memory: 32,
+      cpu: 32,
+    },
+  },
+  scripts: [
+    (import 'front.libsonnet') + {
+      backend_port: 3000,
+      locations: {
+        '/': {
+          allow_only_from: ['10.0.0.0/24'],
         },
-    ],
+      },
+    },
+  ],
 }

data/examples/hello-lb.jsonnet

@@ -2,48 +2,48 @@ local fileProvider = std.native('provide.file');
 local provide(name) = fileProvider(std.toString({ path: 'hello.env' }), name);
 
 {
-    scheduler: {
-        type: 'ecs',
-        region: 'ap-northeast-1',
-        cluster: 'eagletmt',
-        desired_count: 2,
-        role: 'ecsServiceRole',
-        // dynamic_port_mapping cannot be enabled with elb
-        elb: {
-            listeners: [
-                {
-                    load_balancer_port: 80,
-                    protocol: 'HTTP',
-                },
-            ],
-            subnets: ['subnet-XXXXXXXX', 'subnet-YYYYYYYY'],
-            security_groups: ['sg-ZZZZZZZZ'],
+  scheduler: {
+    type: 'ecs',
+    region: 'ap-northeast-1',
+    cluster: 'eagletmt',
+    desired_count: 2,
+    role: 'ecsServiceRole',
+    // dynamic_port_mapping cannot be enabled with elb
+    elb: {
+      listeners: [
+        {
+          load_balancer_port: 80,
+          protocol: 'HTTP',
         },
+      ],
+      subnets: ['subnet-XXXXXXXX', 'subnet-YYYYYYYY'],
+      security_groups: ['sg-ZZZZZZZZ'],
     },
-    app: {
-        image: 'ryotarai/hello-sinatra',
-        memory: 128,
-        cpu: 256,
-        env: {
-            PORT: '3000',
-            MESSAGE: std.format('%s-san', provide('username')),
-        },
+  },
+  app: {
+    image: 'ryotarai/hello-sinatra',
+    memory: 128,
+    cpu: 256,
+    env: {
+      PORT: '3000',
+      MESSAGE: std.format('%s-san', provide('username')),
     },
-    additional_containers: {
-        front: {
-            image_tag: 'hako-nginx',
-            memory: 32,
-            cpu: 32,
-        },
+  },
+  sidecars: {
+    front: {
+      image_tag: 'hako-nginx',
+      memory: 32,
+      cpu: 32,
     },
-    scripts: [
-        (import 'front.libsonnet') + {
-            backend_port: 3000,
-            locations: {
-                '/': {
-                    allow_only_from: ['10.0.0.0/24'],
-                },
-            },
+  },
+  scripts: [
+    (import 'front.libsonnet') + {
+      backend_port: 3000,
+      locations: {
+        '/': {
+          allow_only_from: ['10.0.0.0/24'],
         },
-    ],
+      },
+    },
+  ],
 }

data/examples/hello-nofront.jsonnet

@@ -2,55 +2,55 @@ local fileProvider = std.native('provide.file');
 local provide(name) = fileProvider(std.toString({ path: 'hello.env' }), name);
 
 {
-    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,
+  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',
         },
-    },
-    app: {
-        image: 'ryotarai/hello-sinatra',
-        memory: 128,
-        cpu: 256,
-        env: {
-            PORT: '3000',
-            MESSAGE: std.format('%s-san', provide('username')),
+        {
+          port: 443,
+          protocol: 'HTTPS',
+          certificate_arn: 'arn:aws:iam::012345678901:server-certificate/hello-lb-v2.example.com',
         },
-        // Add port mapping to connect to ELB
-        port_mappings: [
-            {
-                container_port: 3000,
-                host_port: 0,
-                protocol: 'tcp',
-            },
-        ],
+      ],
+      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: {
+      PORT: '3000',
+      MESSAGE: std.format('%s-san', provide('username')),
     },
+    // Add port mapping to connect to ELB
+    port_mappings: [
+      {
+        container_port: 3000,
+        host_port: 0,
+        protocol: 'tcp',
+      },
+    ],
+  },
 }

data/examples/hello-privileged-app.jsonnet

@@ -1,15 +1,15 @@
 {
-    scheduler: {
-        type: 'ecs',
-        region: 'ap-northeast-1',
-        cluster: 'eagletmt',
-        desired_count: 1,
-    },
-    app: {
-        image: 'busybox',
-        memory: 128,
-        cpu: 256,
-        command: ['echo', 'hello from --privileged mode'],
-        privileged: true,
-    },
+  scheduler: {
+    type: 'ecs',
+    region: 'ap-northeast-1',
+    cluster: 'eagletmt',
+    desired_count: 1,
+  },
+  app: {
+    image: 'busybox',
+    memory: 128,
+    cpu: 256,
+    command: ['echo', 'hello from --privileged mode'],
+    privileged: true,
+  },
 }

data/examples/hello.jsonnet

@@ -2,44 +2,54 @@ local fileProvider = std.native('provide.file');
 local provide(name) = fileProvider(std.toString({ path: 'hello.env' }), name);
 
 {
-    scheduler: {
-        type: 'ecs',
-        region: 'ap-northeast-1',
-        cluster: 'eagletmt',
-        desired_count: 2,
-        task_role_arn: 'arn:aws:iam::012345678901:role/HelloRole',
-        deployment_configuration: {
-            maximum_percent: 200,
-            minimum_healthy_percent: 50,
-        },
+  scheduler: {
+    type: 'ecs',
+    region: 'ap-northeast-1',
+    cluster: 'eagletmt',
+    desired_count: 2,
+    task_role_arn: 'arn:aws:iam::012345678901:role/HelloRole',
+    deployment_configuration: {
+      maximum_percent: 200,
+      minimum_healthy_percent: 50,
     },
-    app: {
-        image: 'ryotarai/hello-sinatra',
-        memory: 128,
-        cpu: 256,
-        links: [
-            'redis:redis',
-        ],
-        env: {
-            PORT: '3000',
-            MESSAGE: std.format('%s-san', provide('username')),
-        },
+  },
+  app: {
+    image: 'ryotarai/hello-sinatra',
+    memory: 128,
+    cpu: 256,
+    health_check: {
+      command: [
+        'CMD-SHELL',
+        'curl -f http://localhost:3000/ || exit 1',
+      ],
+      interval: 30,
+      timeout: 5,
+      retries: 3,
+      start_period: 1,
     },
-    additional_containers: {
-        front: {
-            image_tag: 'hako-nginx',
-            memory: 32,
-            cpu: 32,
-        },
-        redis: {
-            image_tag: 'redis:3.0',
-            cpu: 64,
-            memory: 512,
-        },
-    },
-    scripts: [
-        (import 'front.libsonnet') + {
-            backend_port: 3000,
-        },
+    links: [
+      'redis:redis',
     ],
+    env: {
+      PORT: '3000',
+      MESSAGE: std.format('%s-san', provide('username')),
+    },
+  },
+  sidecars: {
+    front: {
+      image_tag: 'hako-nginx',
+      memory: 32,
+      cpu: 32,
+    },
+    redis: {
+      image_tag: 'redis:3.0',
+      cpu: 64,
+      memory: 512,
+    },
+  },
+  scripts: [
+    (import 'front.libsonnet') + {
+      backend_port: 3000,
+    },
+  ],
 }

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', '>= 1.4.0'
+  spec.add_dependency 'aws-sdk-ecs', '>= 1.7.0'
   spec.add_dependency 'aws-sdk-elasticloadbalancing'
   spec.add_dependency 'aws-sdk-elasticloadbalancingv2'
   spec.add_dependency 'aws-sdk-s3'

data/lib/hako/container.rb

@@ -87,6 +87,25 @@ module Hako
       end
     end
 
+    # @return[Hash, nil]
+    def health_check
+      if @definition.key?('health_check')
+        conf = @definition['health_check']
+        ret = {
+          command: conf.fetch('command'),
+          interval: conf.fetch('interval', 30),
+          retries: conf.fetch('retries', 3),
+          timeout: conf.fetch('timeout', 5),
+        }
+
+        if conf.key?('start_period')
+          ret[:start_period] = conf.fetch('start_period')
+        end
+
+        ret
+      end
+    end
+
     # @return [Array<Hash>, nil]
     def ulimits
       if @definition.key?('ulimits')
@@ -138,6 +157,18 @@ module Hako
 
         ret[:init_process_enabled] = conf.fetch('init_process_enabled', nil)
 
+        ret[:shared_memory_size] = conf.fetch('shared_memory_size', nil)
+
+        if conf.key?('tmpfs')
+          ret[:tmpfs] = conf['tmpfs'].map do |t|
+            {
+              container_path: t.fetch('container_path'),
+              mount_options: t.fetch('mount_options', []),
+              size: t.fetch('size')
+            }
+          end
+        end
+
         ret
       end
     end

data/lib/hako/definition_loader.rb

@@ -18,24 +18,25 @@ module Hako
     # @param [Array<String>, nil] with
     # @return [Hash<String, Container>]
     def load(tag, with: nil)
-      additional_containers = @app.definition.fetch('additional_containers', {})
+      # XXX: Load additional_containers for compatibility
+      sidecars = @app.definition.fetch('sidecars', @app.definition.fetch('additional_containers', {}))
       container_names = ['app']
       if with
         container_names.concat(with)
       else
-        container_names.concat(additional_containers.keys)
+        container_names.concat(sidecars.keys)
       end
 
-      load_containers_from_name(tag, container_names, additional_containers)
+      load_containers_from_name(tag, container_names, sidecars)
     end
 
     private
 
     # @param [String] tag
     # @param [Array<String>] container_names
-    # @param [Hash<String, Hash>] additional_containers
+    # @param [Hash<String, Hash>] sidecars
     # @return [Hash<String, Container>]
-    def load_containers_from_name(tag, container_names, additional_containers)
+    def load_containers_from_name(tag, container_names, sidecars)
       names = Set.new(container_names)
       containers = {}
       while containers.size < names.size
@@ -45,13 +46,17 @@ module Hako
             when 'app'
               AppContainer.new(@app, @app.definition['app'].merge('tag' => tag), dry_run: @dry_run)
             else
-              Container.new(@app, additional_containers.fetch(name), dry_run: @dry_run)
+              Container.new(@app, sidecars.fetch(name), dry_run: @dry_run)
             end
 
           containers[name].links.each do |link|
             m = link.match(/\A([^:]+):([^:]+)\z/)
             names << (m ? m[1] : link)
           end
+
+          containers[name].volumes_from.each do |volumes_from|
+            names << volumes_from[:source_container]
+          end
         end
       end
       containers