kontena-plugin-aws 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4531cb5a9f6cb48e66422a32fd82d51dd9a80dc565face3de94893977924eef6
-  data.tar.gz: 1d31821c4ce47c9666bdbb43beaf6b723a8d7c4902c4fb00c3f4e81e4a5e563a
+  metadata.gz: a1c39a10a404506e61fc5f991d0086ae1be56e92e579fb1aab47490556a777f2
+  data.tar.gz: c7fae31982c09ee42b44063aaf7c4b6905407160250934697c6c37f01dbe28c8
 SHA512:
-  metadata.gz: 86ea8c38bf51bc71691c4d67dac2a14d30ef1c21c5e4e27f1de80f688ed066404ae46eef8577757943e9dc4a78c7f9035d118b8cfab7b77d558fa2625a5c5ec3
-  data.tar.gz: 77a357bc3d5ca6594797992e694f3327cee98b824adb0ebac6a1b2ac507af5a6acc1132066f370f2c49a812bba737005c6df9135138d8b8db915d845f273f95c
+  metadata.gz: 54502b59edf8f14630bf40a82fb592987447cec5c82c470c5ea437db4a571aeac72e89454368dc059614244282ab44e8b0013ef5e0eb7e61bdf0f02f090e0a88
+  data.tar.gz: 382e37008e433d0ba793b65e02b6923d98e24200977f52be9643cff8e62cd8707aa1e20463aa68d5b6ce8f8cc097ed46b40d70b0328cd6250798eebff3ba70e0

data/lib/kontena/machine/aws/cloudinit.yml

@@ -12,13 +12,18 @@ write_files:
   - path: /etc/systemd/system/docker.service.d/50-kontena.conf
     content: |
         [Service]
-        Environment='DOCKER_OPTS=--insecure-registry="10.81.0.0/16" --bip="172.17.43.1/16"'
+        Environment='DOCKER_OPTS=--log-driver=json-file --log-opt=max-size=20m --insecure-registry="10.81.0.0/16" --bip="172.17.43.1/16"'
         Environment='DOCKER_CGROUPS=--exec-opt native.cgroupdriver=cgroupfs'
-  - path: /etc/sysctl.d/99-inotify.conf
+  - path: /etc/sysctl.d/99-kontena.conf
     owner: root
     permissions: 0644
     content: |
       fs.inotify.max_user_instances = 8192
+      fs.inotify.max_user_watches = 524288
+      vm.max_map_count = 262144
+      kernel.softlockup_panic = 1
+      kernel.softlockup_all_cpu_backtrace = 1
+      kernel.panic = 60
 coreos:
   units:
     - name: zz-default.network
@@ -55,10 +60,9 @@ coreos:
       content: |
         [Unit]
         Description=kontena-agent
+        Documentation=https://www.kontena.io/
         After=network-online.target
         After=docker.service
-        Description=Kontena Agent
-        Documentation=http://www.kontena.io/
         Requires=network-online.target
         Requires=docker.service
 
@@ -76,5 +80,8 @@ coreos:
             -e KONTENA_PEER_INTERFACE=${KONTENA_PEER_INTERFACE} \
             -v=/var/run/docker.sock:/var/run/docker.sock \
             -v=/etc/kontena-agent.env:/etc/kontena.env \
-            --net=host \
+            --net=host --memory 384m \
             kontena/agent:${KONTENA_VERSION}
+
+        [Install]
+        WantedBy=docker.service

data/lib/kontena/machine/aws/master_provisioner.rb

@@ -36,8 +36,12 @@ module Kontena::Machine::Aws
         end
       end
 
-      ami = resolve_ami(region)
-      abort('No valid AMI found for region') unless ami
+      if opts[:ami]
+        ami = opts[:ami]
+      else
+        ami = resolve_ami(region)
+        abort('No valid AMI found for region') unless ami
+      end
       opts[:vpc] = default_vpc.vpc_id unless opts[:vpc]
 
       raise "Missing :subnet option" if opts[:subnet].nil?

data/lib/kontena/machine/aws/node_provisioner.rb

@@ -24,8 +24,12 @@ module Kontena::Machine::Aws
 
     # @param [Hash] opts
     def run!(opts)
-      ami = resolve_ami(region)
-      abort('No valid AMI found for region') unless ami
+      if opts[:ami]
+        ami = opts[:ami]
+      else
+        ami = resolve_ami(region)
+        abort('No valid AMI found for region') unless ami
+      end
 
       opts[:vpc] = default_vpc.vpc_id unless opts[:vpc]
 

data/lib/kontena/plugin/aws.rb

@@ -1,7 +1,7 @@
 module Kontena
   module Plugin
     module Aws
-      VERSION = "0.3.1"
+      VERSION = "0.4.0"
     end
   end
 end

data/lib/kontena/plugin/aws/master/create_command.rb

@@ -13,6 +13,7 @@ module Kontena::Plugin::Aws::Master
     option "--vault-secret", "VAULT_SECRET", "Secret key for Vault (default: generate random secret)"
     option "--vault-iv", "VAULT_IV", "Initialization vector for Vault (default: generate random iv)"
     option "--mongodb-uri", "URI", "External MongoDB uri (optional)"
+    option "--ami", "AMI", "Which Container Linux AMI to use (default: latest stable)"
 
     def execute
       require 'securerandom'
@@ -33,7 +34,8 @@ module Kontena::Plugin::Aws::Master
         mongodb_uri: mongodb_uri,
         associate_public_ip: associate_public_ip?,
         security_groups: security_groups,
-        initial_admin_code: SecureRandom.hex(16)
+        initial_admin_code: SecureRandom.hex(16),
+        ami: ami
       )
     rescue Seahorse::Client::NetworkingError => ex
       raise ex unless ex.message.match(/certificate verify failed/)

data/lib/kontena/plugin/aws/nodes/create_command.rb

@@ -11,6 +11,7 @@ module Kontena::Plugin::Aws::Nodes
     include Kontena::Plugin::Aws::Prompts::Common
 
     option "--count", "COUNT", "How many instances to create"
+    option "--ami", "AMI", "Which Container Linux AMI to use (default: latest stable)"
 
     requires_current_master
 
@@ -33,7 +34,8 @@ module Kontena::Plugin::Aws::Nodes
         key_pair: key_pair,
         count: count,
         associate_public_ip: associate_public_ip?,
-        security_groups: security_groups
+        security_groups: security_groups,
+        ami: ami
       )
     rescue Seahorse::Client::NetworkingError => ex
       raise ex unless ex.message.match(/certificate verify failed/)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-aws
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2018-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kontena-cli
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Kontena AWS plugin