kontena-plugin-aws 0.1.0 → 0.2.0.pre1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzEzZWQwNDVlMDA5ODZmMmU4NzBkM2FjMDhjYWZmYjk0ZWRlNjZjZg==
+    MjkzMTFkZDliMjJjNTI1NzhjYWFmMGZkYzllMzFmZDM2NjQxMzgwMQ==
   data.tar.gz: !binary |-
-    M2UzYWZmMmU2YzcwN2RlZmZjYzBmOTkxYWMwZTgzMDNhNDUxMDU2NA==
+    ODIyMjJlNDM3NTRhOWNiM2UwZTJkZDRmZmEyY2U2ZDM0NjM1YTcxNQ==
 SHA512:
   metadata.gz: !binary |-
-    NmFmMTA5NDFjN2U4NjFjMjU5MDQxNDFmN2MwNzY3M2Q3MWRmY2Y5MjdhZWEy
-    MzMwZTg2ZTM4YjljNTAzNjBkMWIxY2NkYzk1NWRmMzZmYzYxZmRmMzc1YTQ0
-    ZmZmNjI2ZTFiYmU3ZjhkYjU2MzBkZTlhMTc2MGMxZjMzZjZkOGU=
+    MmUwNDkwZTdjNjRkMWQyNGYzYjM0M2ZmYjc0ODI3MDczYzA5YWQxZWFiODcx
+    ZDBhMzI0OTEyMWY4N2M1MmRlYzI2ZjRmNjE5ZGExZjEwY2E1OWE1NWYxMzk4
+    NTYxYjY1OTUxNWU4ZTg1MTgyMjUyNTJiZDgwODM0MjQ4ZDljY2Y=
   data.tar.gz: !binary |-
-    MmM5NzMyZjBhNmQ4NWM5M2Q2MWYzM2Y3NjVjNDIyZGVmNGNlNDkzY2ZiYTM4
-    NzNjYmFkYmQ3NmY4Njc5YmIyY2I5NzBkZjNkOTMzOGQ2ZTU3ZGFhM2IyNDE5
-    N2M5MDRlNzNmNWViMzg0NDBhNGUzNjc2ZDM5ZDQ2YjJmMmEzMGQ=
+    NjM4MGQ2YjMzZjUxMGE2ZTY3ODQ4ZTAzYmYzNDE5YmQ1Njc3OGQ3Nzg4YTcx
+    MTk3NzA1OWI0OWE4MjI4NjQyZWQ5ZTMxODIwM2M2MjYwYzJkOWE4Nzc5NDNl
+    ZjBlZDllOWVmNmY3MDY5MjI5YjM0MGMwZTVmM2MxOWJlNWM0NzY=

data/kontena-plugin-aws.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'kontena-cli', '>= 0.15.0.rc1'
+  spec.add_runtime_dependency 'kontena-cli', '~> 0.16.0.pre2'
   spec.add_runtime_dependency 'aws-sdk', '~> 2.3', '>= 2.3.11'
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"

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

@@ -89,8 +89,11 @@ coreos:
             --link kontena-server-mongo:mongodb \
             -e MONGODB_URI=mongodb://mongodb:27017/kontena_server \
   <% end -%>
-  <% if auth_server %>
-            -e AUTH_API_URL=<%= auth_server %> \
+  <% if server_name %>
+            -e KONTENA_SERVER_NAME=<%= server_name %> \
+  <% end -%>
+  <% if initial_admin_code %>
+            -e KONTENA_INITIAL_ADMIN_CODE=<%= intial_admin_code %> \
   <% end -%>
             -e VAULT_KEY=${KONTENA_VAULT_KEY} -e VAULT_IV=${KONTENA_VAULT_IV} \
             kontena/server:${KONTENA_VERSION}

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

@@ -1,7 +1,8 @@
 require 'fileutils'
 require 'erb'
 require 'open3'
-require 'shell-spinner'
+require 'securerandom'
+
 require_relative 'common'
 
 module Kontena::Machine::Aws
@@ -9,6 +10,8 @@ module Kontena::Machine::Aws
     include Kontena::Machine::RandomName
     include Kontena::Machine::CertHelper
     include Common
+    include Kontena::Cli::ShellSpinner
+
     attr_reader :ec2, :http_client, :region
 
     # @param [String] access_key_id aws_access_key_id
@@ -27,7 +30,7 @@ module Kontena::Machine::Aws
         abort('Invalid ssl cert') unless File.exists?(File.expand_path(opts[:ssl_cert]))
         ssl_cert = File.read(File.expand_path(opts[:ssl_cert]))
       else
-        ShellSpinner "Generating self-signed SSL certificate" do
+        spinner "Generating self-signed SSL certificate" do
           ssl_cert = generate_self_signed_cert
         end
       end
@@ -41,20 +44,18 @@ module Kontena::Machine::Aws
         subnet = ec2.subnet(opts[:subnet])
       end
       abort('Failed to find subnet!') unless subnet
-      userdata_vars = {
+
+      name = opts[:name] || generate_name
+
+      userdata_vars = opts.merge(
           ssl_cert: ssl_cert,
-          auth_server: opts[:auth_server],
-          version: opts[:version],
-          vault_secret: opts[:vault_secret],
-          vault_iv: opts[:vault_iv],
-          mongodb_uri: opts[:mongodb_uri]
-      }
+          server_name: name.sub('kontena-master-', '')
+      )
 
       security_groups = opts[:security_groups] ?
           resolve_security_groups_to_ids(opts[:security_groups], opts[:vpc]) :
           ensure_security_group(opts[:vpc])
 
-      name = generate_name
       ec2_instance = ec2.create_instances({
         image_id: ami,
         min_count: 1,
@@ -88,8 +89,8 @@ module Kontena::Machine::Aws
         ]
       })
 
-      ShellSpinner "Creating AWS instance #{name.colorize(:cyan)} " do
-        sleep 5 until ec2_instance.reload.state.name == 'running'
+      spinner "Creating AWS instance #{name.colorize(:cyan)} " do
+        sleep 1 until ec2_instance.reload.state.name == 'running'
       end
       public_ip = ec2_instance.reload.public_ip_address
       if public_ip.nil?
@@ -99,13 +100,18 @@ module Kontena::Machine::Aws
         master_url = "https://#{ec2_instance.public_ip_address}"
         Excon.defaults[:ssl_verify_peer] = false
         http_client = Excon.new(master_url, :connect_timeout => 10)
-        ShellSpinner "Waiting for #{name.colorize(:cyan)} to start " do
-          sleep 5 until master_running?(http_client)
+        spinner "Waiting for #{name.colorize(:cyan)} to start " do
+          sleep 1 until master_running?(http_client)
         end
       end
-
-      puts "Kontena Master is now running at #{master_url}"
-      puts "Use #{"kontena login --name=#{name.sub('kontena-master-', '')} #{master_url}".colorize(:light_black)} to complete Kontena Master setup"
+      puts
+      puts "Kontena Master is now running at #{master_url}".colorize(:green)
+      puts
+      {
+        name: name.sub('kontena-master-', ''),
+        public_ip: public_ip,
+        code: opts[:initial_admin_code]
+      }
     end
 
     ##
@@ -116,7 +122,7 @@ module Kontena::Machine::Aws
       group_id = resolve_security_groups_to_ids(group_name, vpc_id)
 
       if group_id.empty?
-        ShellSpinner "Creating AWS security group" do
+        spinner "Creating AWS security group" do
           sg = create_security_group(group_name, vpc_id)
           group_id = [sg.group_id]
         end

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

@@ -1,10 +1,10 @@
-require 'shell-spinner'
-
 module Kontena
   module Machine
     module Aws
       class NodeDestroyer
 
+        include Kontena::Cli::ShellSpinner
+
         attr_reader :ec2, :api_client
 
         # @param [Kontena::Client] api_client Kontena api client
@@ -29,10 +29,10 @@ module Kontena
           abort("There are multiple instances with name #{name}") if instances.to_a.size > 1
           instance = instances.first
           if instance
-            ShellSpinner "Terminating AWS instance #{name.colorize(:cyan)} " do
+            spinner "Terminating AWS instance #{name.colorize(:cyan)} " do
               instance.terminate
               until instance.reload.state.name.to_s == 'terminated'
-                sleep 2
+                sleep 1
               end
             end
           else
@@ -40,7 +40,7 @@ module Kontena
           end
           node = api_client.get("grids/#{grid['id']}/nodes")['nodes'].find{|n| n['name'] == name}
           if node
-            ShellSpinner "Removing node #{name.colorize(:cyan)} from grid #{grid['name'].colorize(:cyan)} " do
+            spinner "Removing node #{name.colorize(:cyan)} from grid #{grid['name'].colorize(:cyan)} " do
               api_client.delete("grids/#{grid['id']}/nodes/#{name}")
             end
           end

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

@@ -1,12 +1,12 @@
 require 'fileutils'
 require 'erb'
 require 'open3'
-require 'shell-spinner'
 require_relative 'common'
 
 module Kontena::Machine::Aws
   class NodeProvisioner
     include Kontena::Machine::RandomName
+    include Kontena::Cli::ShellSpinner
     include Common
 
     attr_reader :ec2, :api_client
@@ -83,12 +83,12 @@ module Kontena::Machine::Aws
         ]
       })
 
-      ShellSpinner "Creating AWS instance #{name.colorize(:cyan)} " do
-        sleep 5 until ec2_instance.reload.state.name == 'running'
+      spinner "Creating AWS instance #{name.colorize(:cyan)} " do
+        sleep 1 until ec2_instance.reload.state.name == 'running'
       end
       node = nil
-      ShellSpinner "Waiting for node #{name.colorize(:cyan)} join to grid #{opts[:grid].colorize(:cyan)} " do
-        sleep 2 until node = instance_exists_in_grid?(opts[:grid], name)
+      spinner "Waiting for node #{name.colorize(:cyan)} join to grid #{opts[:grid].colorize(:cyan)} " do
+        sleep 1 until node = instance_exists_in_grid?(opts[:grid], name)
       end
       labels = [
         "region=#{region}",
@@ -106,7 +106,7 @@ module Kontena::Machine::Aws
       group_id = resolve_security_groups_to_ids(group_name, vpc_id)
 
       if group_id.empty?
-        ShellSpinner "Creating AWS security group" do
+        spinner "Creating AWS security group" do
           sg = create_security_group(group_name, vpc_id)
           group_id = [sg.group_id]
         end

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

@@ -1,9 +1,9 @@
-require 'shell-spinner'
 require_relative 'common'
 
 module Kontena::Machine::Aws
   class NodeRestarter
     include Common
+    include Kontena::Cli::ShellSpinner
 
     attr_reader :ec2, :api_client
 
@@ -26,7 +26,7 @@ module Kontena::Machine::Aws
       abort("There are multiple instances with name #{name}") if instances.to_a.size > 1
       instance = instances.first
       if instance
-        ShellSpinner "Restarting AWS instance #{name.colorize(:cyan)} " do
+        spinner "Restarting AWS instance #{name.colorize(:cyan)} " do
           instance.reboot(dry_run: false)
         end
       else

data/lib/kontena/plugin/aws.rb

@@ -1,7 +1,7 @@
 module Kontena
   module Plugin
     module Aws
-      VERSION = "0.1.0"
+      VERSION = "0.2.0.pre1"
     end
   end
 end

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

@@ -4,6 +4,7 @@ module Kontena::Plugin::Aws::Master
   class CreateCommand < Kontena::Command
     include Kontena::Cli::Common
 
+    option "--name", "[NAME]", "Set Master name"
     option "--access-key", "ACCESS_KEY", "AWS access key ID", required: true
     option "--secret-key", "SECRET_KEY", "AWS secret key", required: true
     option "--key-pair", "KEY_PAIR", "EC2 key pair name", required: true
@@ -18,16 +19,15 @@ module Kontena::Plugin::Aws::Master
     option "--vault-iv", "VAULT_IV", "Initialization vector for Vault (default: generate random iv)"
     option "--mongodb-uri", "URI", "External MongoDB uri (optional)"
     option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
-    option "--auth-provider-url", "AUTH_PROVIDER_URL", "Define authentication provider url (optional)"
     option "--associate-public-ip-address", :flag, "Whether to associated public IP in case the VPC defaults to not doing it", default: true, attribute_name: :associate_public_ip
     option "--security-groups", "SECURITY_GROUPS", "Comma separated list of security groups (names) where the new instance will be attached (default: create 'kontena_master' group if not already existing)"
 
-
     def execute
       require 'kontena/machine/aws'
 
       provisioner = provisioner(access_key, secret_key, region)
       provisioner.run!(
+          name: name,
           type: type,
           vpc: vpc_id,
           zone: zone,
@@ -36,12 +36,12 @@ module Kontena::Plugin::Aws::Master
           storage: storage,
           version: version,
           key_pair: key_pair,
-          auth_server: auth_provider_url,
           vault_secret: vault_secret || SecureRandom.hex(24),
           vault_iv: vault_iv || SecureRandom.hex(24),
           mongodb_uri: mongodb_uri,
           associate_public_ip: associate_public_ip?,
-          security_groups: security_groups
+          security_groups: security_groups,
+          initial_admin_code: SecureRandom.hex(16)
       )
     end
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-aws
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0.pre1
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-11 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kontena-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.15.0.rc1
+        version: 0.16.0.pre2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.15.0.rc1
+        version: 0.16.0.pre2
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -119,9 +119,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5