kontena-plugin-digitalocean 0.1.1 → 0.2.0.pre1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODNkN2QwMTliNjdiNWY5OWVlMzJlNzg4ZTM5YzQ5MjRjMzYyZjMxOQ==
+    ZTZhZjg5NDVkYzI2ZjZmY2EyMTA0ZDk4YTRjMWU0ZjZhMGNiOGVkYQ==
   data.tar.gz: !binary |-
-    NTcxOGMxNDdhOTNjMTAxZmQ3NzM1NmVjODYxMTBkYjMzNmYwMDVkNw==
+    NTVkMjYyZTA1Y2E1NmZiNDVlOThhYWExNWZlODFlOTM2ODFlZWVhZQ==
 SHA512:
   metadata.gz: !binary |-
-    YTdmM2E1ZDMwZGNlZWNlMWViMzg5NjVjYTNhMTNlNmYzNDllNzQ5NjcxMTA5
-    MzU1MDdhYTM4NTQ2YTExMDYzNjA1NmNiOWUwOGY1YzE1OTZiNWU3YjVmZjBm
-    MGRjMDkyYzA1N2E3ZGJhZTE3ZTJhNjJmNzJmNTMzN2JhMTdmOTQ=
+    NGUxZjRmNWU3ODBmYjVlMTRkY2JjZWQ2NjRjYmE4YmJkNjJiYjc5ZjJkYTYx
+    ZGYxOWU2MTBjYmI4NzMwN2ZkNTFmODNkNzhmNmQ5ZmRkZmQzY2Y1ZTBiOWM3
+    ZDMzNzM4ZTg2NzM5YWExODFjNTIzNzBiZWM0YzBkNDQ0NDNmMWI=
   data.tar.gz: !binary |-
-    MjJjYjY0OTVjMmNhZTUxZWUwMmMxODk5NzMzMGQ5OGMwZThjZDM2ZmQ0ZTM5
-    YjgwMGE1NGRiODQ1NTdiMzk1MDcwOTRmMWJjY2Q1ODkzYjkxMWY3NjQ5YTMz
-    NmE2YjRmNjM2OTA5MGNhYjE3MDg0YWY3YjFiNmFmNmIzZDJhMTM=
+    ZDdkY2I3N2I3OGQ0NzJiNDY5ZDEzNjkwOWYyYWMzNTY1MWY2ZGQzYjkwMGE2
+    MzQyYTM5NzhkMjcwNDMwOGRmNTQwMDJhZGRmYWNlZDkyYmE0NDFjZjU1MjQ5
+    ZDIzMDdmOGZhMmM0ZDg4NTQ0ZWExNzJhOWMyNzAzYjQ0MTY5OGU=

data/kontena-plugin-digitalocean.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 'droplet_kit', '~> 1.4', '>= 1.4.1'
   spec.add_runtime_dependency 'activesupport', '~> 4.0'
   spec.add_development_dependency "bundler", "~> 1.11"

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

@@ -63,4 +63,3 @@ coreos:
             -v=/etc/kontena-agent.env:/etc/kontena.env \
             --net=host \
             kontena/agent:${KONTENA_VERSION}
-        ExecStop=/usr/bin/docker stop kontena-agent

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

@@ -54,7 +54,6 @@ coreos:
         ExecStart=/usr/bin/docker run --name=kontena-server-mongo \
             --volumes-from=kontena-server-mongo-data \
             mongo:3.0 mongod --smallfiles
-        ExecStop=/usr/bin/docker stop kontena-server-mongo
 <% end -%>
     - name: kontena-server-api.service
       command: start
@@ -90,12 +89,14 @@ 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=<%= initial_admin_code %> \
 <% end -%>
             -e VAULT_KEY=${KONTENA_VAULT_KEY} -e VAULT_IV=${KONTENA_VAULT_IV} \
             kontena/server:${KONTENA_VERSION}
-        ExecStop=/usr/bin/docker stop kontena-server-api
 
     - name: kontena-server-haproxy.service
       command: start
@@ -120,4 +121,3 @@ coreos:
         ExecStartPre=-/usr/bin/docker rm kontena-server-haproxy
         ExecStartPre=-/usr/bin/docker pull kontena/haproxy:latest
         ExecStart=/opt/bin/kontena-haproxy.sh
-        ExecStop=/usr/bin/docker stop kontena-server-haproxy

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

@@ -1,7 +1,6 @@
 require 'fileutils'
 require 'erb'
 require 'open3'
-require 'shell-spinner'
 
 module Kontena
   module Machine
@@ -9,6 +8,7 @@ module Kontena
       class MasterProvisioner
         include RandomName
         include Machine::CertHelper
+        include Kontena::Cli::ShellSpinner
 
         attr_reader :client, :http_client
 
@@ -27,22 +27,19 @@ module Kontena
             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
 
-          userdata_vars = {
+          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-', '')
+          )
 
           droplet = DropletKit::Droplet.new(
-              name: generate_name,
+              name: name,
               region: opts[:region],
               image: 'coreos-stable',
               size: opts[:size],
@@ -51,11 +48,11 @@ module Kontena
               ssh_keys: [ssh_key.id]
           )
 
-          ShellSpinner "Creating DigitalOcean droplet #{droplet.name.colorize(:cyan)} " do
+          spinner "Creating DigitalOcean droplet #{droplet.name.colorize(:cyan)} " do
             droplet = client.droplets.create(droplet)
             until droplet.status == 'active'
               droplet = client.droplets.find(id: droplet.id)
-              sleep 5
+              sleep 1
             end
           end
 
@@ -63,12 +60,19 @@ module Kontena
           Excon.defaults[:ssl_verify_peer] = false
           @http_client = Excon.new("#{master_url}", :connect_timeout => 10)
 
-          ShellSpinner "Waiting for #{droplet.name.colorize(:cyan)} to start" do
-            sleep 5 until master_running?
+          spinner "Waiting for #{droplet.name.colorize(:cyan)} to start" do
+            sleep 0.5 until master_running?
           end
 
-          puts "Kontena Master is now running at #{master_url}"
-          puts "Use #{"kontena login --name=#{droplet.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: droplet.public_ip,
+            code: opts[:initial_admin_code]
+          }
         end
 
         def user_data(vars)

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

@@ -1,10 +1,9 @@
-require 'shell-spinner'
-
 module Kontena
   module Machine
     module DigitalOcean
       class NodeDestroyer
         include RandomName
+        include Kontena::Cli::ShellSpinner
 
         attr_reader :client, :api_client
 
@@ -18,7 +17,7 @@ module Kontena
         def run!(grid, name)
           droplet = client.droplets.all.find{|d| d.name == name}
           if droplet
-            ShellSpinner "Terminating DigitalOcean droplet #{name.colorize(:cyan)} " do
+            spinner "Terminating DigitalOcean droplet #{name.colorize(:cyan)} " do
               result = client.droplets.delete(id: droplet.id)
               if result.is_a?(String)
                 abort "Cannot delete droplet #{name.colorize(:cyan)} in DigitalOcean"
@@ -29,7 +28,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/digital_ocean/node_provisioner.rb

@@ -1,13 +1,13 @@
 require 'fileutils'
 require 'erb'
 require 'open3'
-require 'shell-spinner'
 
 module Kontena
   module Machine
     module DigitalOcean
       class NodeProvisioner
         include RandomName
+        include Kontena::Cli::ShellSpinner
 
         attr_reader :client, :api_client
 
@@ -40,12 +40,12 @@ module Kontena
             ssh_keys: [ssh_key.id]
           )
           created = client.droplets.create(droplet)
-          ShellSpinner "Creating DigitalOcean droplet #{droplet.name.colorize(:cyan)} " do
-            sleep 5 until client.droplets.find(id: created.id).status == 'active'
+          spinner "Creating DigitalOcean droplet #{droplet.name.colorize(:cyan)} " do
+            sleep 1 until client.droplets.find(id: created.id).status == 'active'
           end
           node = nil
-          ShellSpinner "Waiting for node #{droplet.name.colorize(:cyan)} join to grid #{opts[:grid].colorize(:cyan)} " do
-            sleep 2 until node = droplet_exists_in_grid?(opts[:grid], droplet)
+          spinner "Waiting for node #{droplet.name.colorize(:cyan)} join to grid #{opts[:grid].colorize(:cyan)} " do
+            sleep 1 until node = droplet_exists_in_grid?(opts[:grid], droplet)
           end
           set_labels(
             node,

data/lib/kontena/plugin/digital_ocean.rb

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

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

@@ -4,6 +4,7 @@ module Kontena::Plugin::DigitalOcean::Master
   class CreateCommand < Kontena::Command
     include Kontena::Cli::Common
 
+    option "--name", "[NAME]", "Set master name"
     option "--token", "TOKEN", "DigitalOcean API token", required: true
     option "--ssh-key", "SSH_KEY", "Path to ssh public key", default: '~/.ssh/id_rsa.pub'
     option "--ssl-cert", "SSL CERT", "SSL certificate file"
@@ -13,11 +14,10 @@ module Kontena::Plugin::DigitalOcean::Master
     option "--vault-iv", "VAULT_IV", "Initialization vector for Vault (optional)"
     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"
 
 
     def execute
-      require_relative '../../../machine/digital_ocean'
+      require 'kontena/machine/digital_ocean'
 
       provisioner = provisioner(token)
       provisioner.run!(
@@ -26,9 +26,9 @@ module Kontena::Plugin::DigitalOcean::Master
           size: size,
           region: region,
           version: version,
-          auth_server: auth_provider_url,
           vault_secret: vault_secret || SecureRandom.hex(24),
           vault_iv: vault_iv || SecureRandom.hex(24),
+          initial_admin_code: SecureRandom.hex(16),
           mongodb_uri: mongodb_uri
       )
     end

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

@@ -14,7 +14,7 @@ module Kontena::Plugin::DigitalOcean::Nodes
       require_api_url
       require_current_grid
 
-      require_relative '../../../machine/digital_ocean'
+      require 'kontena/machine/digital_ocean'
       grid = fetch_grid
       provisioner = provisioner(client(require_token), token)
       provisioner.run!(

data/lib/kontena/plugin/digital_ocean/nodes/restart_command.rb

@@ -10,14 +10,14 @@ module Kontena::Plugin::DigitalOcean::Nodes
       require_api_url
       require_current_grid
 
-      require_relative '../../../machine/digital_ocean'
+      require 'kontena/machine/digital_ocean'
 
       client = DropletKit::Client.new(access_token: token)
       droplet = client.droplets.all.find{|d| d.name == name}
       if droplet
-        ShellSpinner "Restarting DigitalOcean droplet #{name.colorize(:cyan)} " do
+        spinner "Restarting DigitalOcean droplet #{name.colorize(:cyan)} " do
           client.droplet_actions.reboot(droplet_id: droplet.id)
-          sleep 5 until client.droplets.find(id: droplet.id).status == 'active'
+          sleep 1 until client.droplets.find(id: droplet.id).status == 'active'
         end
       else
         abort "Cannot find droplet #{name.colorize(:cyan)} in DigitalOcean"

data/lib/kontena/plugin/digital_ocean/nodes/terminate_command.rb

@@ -10,7 +10,7 @@ module Kontena::Plugin::DigitalOcean::Nodes
       require_api_url
       require_current_grid
 
-      require_relative '../../../machine/digital_ocean'
+      require 'kontena/machine/digital_ocean'
       grid = client(require_token).get("grids/#{current_grid}")
       destroyer = destroyer(client(require_token), token)
       destroyer.run!(grid, name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-digitalocean
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0.pre1
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-01 00:00:00.000000000 Z
+date: 2016-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kontena-cli
@@ -16,14 +16,14 @@ dependencies:
     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: droplet_kit
   requirement: !ruby/object:Gem::Requirement
@@ -131,9 +131,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