kontena-plugin-digitalocean 0.2.0.pre1 → 0.2.0.pre2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTZhZjg5NDVkYzI2ZjZmY2EyMTA0ZDk4YTRjMWU0ZjZhMGNiOGVkYQ==
+    NTdhMmE4ZTZmOGQzMmRiOWM5NGE3ZTI1YzZlOTVmNTMxZWNiYWQ4ZA==
   data.tar.gz: !binary |-
-    NTVkMjYyZTA1Y2E1NmZiNDVlOThhYWExNWZlODFlOTM2ODFlZWVhZQ==
+    NDBlMmI3YTJmY2YxZjlmMjQ4M2MwYzZjMmY4ZjhhNTM5ZjNjYWY1Ng==
 SHA512:
   metadata.gz: !binary |-
-    NGUxZjRmNWU3ODBmYjVlMTRkY2JjZWQ2NjRjYmE4YmJkNjJiYjc5ZjJkYTYx
-    ZGYxOWU2MTBjYmI4NzMwN2ZkNTFmODNkNzhmNmQ5ZmRkZmQzY2Y1ZTBiOWM3
-    ZDMzNzM4ZTg2NzM5YWExODFjNTIzNzBiZWM0YzBkNDQ0NDNmMWI=
+    NWJlZGYxOGZiODc0YjRjMzY3YWY0NWQ5NWVkMjFmYjdiMjA4Y2IzNDQ0NWZl
+    MDUyZjU1NjI5YjczNjE1MWUzMWVlZGQ1MjQ5OWU5YjAzZDcyYzBlZWYyYzIz
+    NDFmZDZjMjQyNzQxNTlhZGFkNTIzMGY3ZjEwNmNlMDA4NTYyNWI=
   data.tar.gz: !binary |-
-    ZDdkY2I3N2I3OGQ0NzJiNDY5ZDEzNjkwOWYyYWMzNTY1MWY2ZGQzYjkwMGE2
-    MzQyYTM5NzhkMjcwNDMwOGRmNTQwMDJhZGRmYWNlZDkyYmE0NDFjZjU1MjQ5
-    ZDIzMDdmOGZhMmM0ZDg4NTQ0ZWExNzJhOWMyNzAzYjQ0MTY5OGU=
+    YmY2OTgxZWIwZDRjZDdkMjVjZmIwZTAwNzk2Yjk4OWVmNjFjNjQzOWI2MWY1
+    MDg4OWNjZTExNDQ5NGYxODQyNTljMmJiMWZhOGVlYjgyOGJkNDIyMjA0ZmY5
+    ZDliNzMxM2QyNWM5NThmY2RmZjQxMmU1OWRiOWM5NTM1NDM2Yjc=

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

@@ -63,3 +63,4 @@ 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,6 +54,7 @@ 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
@@ -89,14 +90,15 @@ coreos:
             --link kontena-server-mongo:mongodb \
             -e MONGODB_URI=mongodb://mongodb:27017/kontena_server \
 <% end -%>
-<% if server_name %>
-            -e KONTENA_SERVER_NAME=<%= server_name %> \
+<% if server_name -%>
+            -e SERVER_NAME=<%= server_name %> \
 <% end -%>
-<% if initial_admin_code %>
-            -e KONTENA_INITIAL_ADMIN_CODE=<%= initial_admin_code %> \
+<% if initial_admin_code -%>
+            -e 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
@@ -121,3 +123,4 @@ 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/node_provisioner.rb

@@ -29,32 +29,37 @@ module Kontena
             master_uri: opts[:master_uri],
             grid_token: opts[:grid_token],
           }
-
-          droplet = DropletKit::Droplet.new(
-            name: opts[:name] || generate_name,
-            region: opts[:region],
-            image: 'coreos-stable',
-            size: opts[:size],
-            private_networking: true,
-            user_data: user_data(userdata_vars),
-            ssh_keys: [ssh_key.id]
-          )
-          created = client.droplets.create(droplet)
-          spinner "Creating DigitalOcean droplet #{droplet.name.colorize(:cyan)} " do
-            sleep 1 until client.droplets.find(id: created.id).status == 'active'
+          droplets = []
+          opts[:count].to_i.times do
+            droplet = DropletKit::Droplet.new(
+              name: opts[:name] || generate_name,
+              region: opts[:region],
+              image: 'coreos-stable',
+              size: opts[:size],
+              private_networking: true,
+              user_data: user_data(userdata_vars),
+              ssh_keys: [ssh_key.id]
+            )
+            created = client.droplets.create(droplet)
+            spinner "Creating DigitalOcean droplet #{droplet.name.colorize(:cyan)} " do
+              sleep 1 until client.droplets.find(id: created.id).status == 'active'
+            end
+            droplets << droplet
           end
-          node = nil
-          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)
+          droplets.each do |droplet|
+            node = nil
+            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,
+              [
+                "region=#{opts[:region]}",
+                "az=#{opts[:region]}",
+                "provider=digitalocean"
+              ]
+            )
           end
-          set_labels(
-            node,
-            [
-              "region=#{opts[:region]}",
-              "az=#{opts[:region]}",
-              "provider=digitalocean"
-            ]
-          )
         end
 
         def user_data(vars)

data/lib/kontena/plugin/digital_ocean.rb

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

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

@@ -1,15 +1,17 @@
 require 'securerandom'
+require_relative '../prompts'
 
 module Kontena::Plugin::DigitalOcean::Master
   class CreateCommand < Kontena::Command
     include Kontena::Cli::Common
+    include Kontena::Plugin::DigitalOcean::Prompts
 
     option "--name", "[NAME]", "Set master name"
-    option "--token", "TOKEN", "DigitalOcean API token", required: true
+    option "--token", "TOKEN", "DigitalOcean API token", environment_variable: "DO_TOKEN" 
+    option "--region", "REGION", "Region"
+    option "--size", "SIZE", "Droplet size"
     option "--ssh-key", "SSH_KEY", "Path to ssh public key", default: '~/.ssh/id_rsa.pub'
     option "--ssl-cert", "SSL CERT", "SSL certificate file"
-    option "--size", "SIZE", "Droplet size", default: '1gb'
-    option "--region", "REGION", "Region", default: 'ams2'
     option "--vault-secret", "VAULT_SECRET", "Secret key for Vault (optional)"
     option "--vault-iv", "VAULT_IV", "Initialization vector for Vault (optional)"
     option "--mongodb-uri", "URI", "External MongoDB uri (optional)"
@@ -17,14 +19,19 @@ module Kontena::Plugin::DigitalOcean::Master
 
 
     def execute
-      require 'kontena/machine/digital_ocean'
+      do_token = ask_do_token
 
-      provisioner = provisioner(token)
+      require_relative '../../../machine/digital_ocean'
+
+      do_region = ask_droplet_region(do_token)
+      do_size = ask_droplet_size(do_token, do_region)
+
+      provisioner = provisioner(do_token)
       provisioner.run!(
           ssh_key: ssh_key,
           ssl_cert: ssl_cert,
-          size: size,
-          region: region,
+          size: do_size,
+          region: do_region,
           version: version,
           vault_secret: vault_secret || SecureRandom.hex(24),
           vault_iv: vault_iv || SecureRandom.hex(24),

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

@@ -1,34 +1,54 @@
+require_relative '../prompts'
+
 module Kontena::Plugin::DigitalOcean::Nodes
   class CreateCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
+    include Kontena::Plugin::DigitalOcean::Prompts
 
     parameter "[NAME]", "Node name"
-    option "--token", "TOKEN", "DigitalOcean API token", required: true
+    option "--token", "TOKEN", "DigitalOcean API token", environment_variable: 'DO_TOKEN'
+    option "--region", "REGION", "Region"
     option "--ssh-key", "SSH_KEY", "Path to ssh public key", default: '~/.ssh/id_rsa.pub'
-    option "--size", "SIZE", "Droplet size", default: '1gb'
-    option "--region", "REGION", "Region", default: 'ams2'
+    option "--size", "SIZE", "Droplet size"
+    option "--count", "COUNT", "How many droplets to create"
     option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
 
     def execute
       require_api_url
       require_current_grid
 
-      require 'kontena/machine/digital_ocean'
+      do_token = ask_do_token
+
+      require_relative '../../../machine/digital_ocean'
+
+      do_region = ask_droplet_region(do_token)
+      do_size = ask_droplet_size(do_token, do_region)
+      do_count = ask_droplet_count
+
       grid = fetch_grid
-      provisioner = provisioner(client(require_token), token)
+      provisioner = provisioner(client(require_token), do_token)
       provisioner.run!(
         master_uri: api_url,
         grid_token: grid['token'],
         grid: current_grid,
         ssh_key: ssh_key,
         name: name,
-        size: size,
-        region: region,
+        size: do_size,
+        count: do_count,
+        region: do_region,
         version: version
       )
     end
 
+    def ask_droplet_count
+      if self.count.nil?
+        prompt.ask('How many droplets?: ', default: 1)
+      else
+        self.count
+      end
+    end
+
     # @param [Kontena::Client] client
     # @param [String] token
     def provisioner(client, token)

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

@@ -1,26 +1,31 @@
+require_relative '../prompts'
+
 module Kontena::Plugin::DigitalOcean::Nodes
   class RestartCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
+    include Kontena::Plugin::DigitalOcean::Prompts
 
-    parameter "NAME", "Node name"
-    option "--token", "TOKEN", "DigitalOcean API token", required: true
+    parameter "[NAME]", "Node name"
+    option "--token", "TOKEN", "DigitalOcean API token", environment_variable: "DO_TOKEN"
 
     def execute
       require_api_url
       require_current_grid
+      do_token = ask_do_token
 
-      require 'kontena/machine/digital_ocean'
+      require_relative '../../../machine/digital_ocean'
 
-      client = DropletKit::Client.new(access_token: token)
-      droplet = client.droplets.all.find{|d| d.name == name}
+      node_name = ask_node(require_token)
+      client = DropletKit::Client.new(access_token: do_token)
+      droplet = client.droplets.all.find{|d| d.name == node_name}
       if droplet
-        spinner "Restarting DigitalOcean droplet #{name.colorize(:cyan)} " do
+        spinner "Restarting DigitalOcean droplet #{pastel.cyan(name)} " do
           client.droplet_actions.reboot(droplet_id: droplet.id)
           sleep 1 until client.droplets.find(id: droplet.id).status == 'active'
         end
       else
-        abort "Cannot find droplet #{name.colorize(:cyan)} in DigitalOcean"
+        exit_with_error "Cannot find droplet #{pastel.cyan(name)} in DigitalOcean"
       end
     end
   end

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

@@ -1,19 +1,27 @@
+require_relative '../prompts'
+
 module Kontena::Plugin::DigitalOcean::Nodes
   class TerminateCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
+    include Kontena::Plugin::DigitalOcean::Prompts
 
-    parameter "NAME", "Node name"
-    option "--token", "TOKEN", "DigitalOcean API token", required: true
+    parameter "[NAME]", "Node name"
+    option "--token", "TOKEN", "DigitalOcean API token", environment_variable: "DO_TOKEN"
+    option "--force", :flag, "Force remove", default: false, attribute_name: :forced
 
     def execute
       require_api_url
       require_current_grid
+      token = require_token
+      node_name = ask_node(token)
+      do_token = ask_do_token
+      confirm_command(node_name) unless forced?
 
-      require 'kontena/machine/digital_ocean'
+      require_relative '../../../machine/digital_ocean'
       grid = client(require_token).get("grids/#{current_grid}")
-      destroyer = destroyer(client(require_token), token)
-      destroyer.run!(grid, name)
+      destroyer = destroyer(client(token), do_token)
+      destroyer.run!(grid, node_name)
     end
 
     # @param [Kontena::Client] client

data/lib/kontena/plugin/digital_ocean/prompts.rb

@@ -0,0 +1,56 @@
+module Kontena::Plugin::DigitalOcean::Prompts
+  def ask_do_token
+    if self.token.nil?
+      prompt.ask('DigitalOcean API token: ', echo: false)
+    else
+      self.token
+    end
+  end
+
+  def ask_droplet_region(do_token)
+    if self.region.nil?
+      prompt.select("Choose a datacenter region: ") do |menu|
+        do_client = DropletKit::Client.new(access_token: do_token)
+        do_client.regions.all.sort_by{|r| r.slug }.each{ |region|
+          menu.choice region.name, region.slug
+        }
+      end
+    else
+      self.region
+    end
+  end
+
+  def ask_droplet_size(do_token, do_region)
+    if self.size.nil?
+      prompt.select("Choose droplet size: ") do |menu|
+        do_client = DropletKit::Client.new(access_token: do_token)
+        do_client.sizes.all.to_a.select{ |s| s.memory > 1000 }.sort_by{|s| s.memory }.each{ |size|
+          if size.regions.include?(do_region)
+            memory = size.memory.to_i / 1024
+            menu.choice "#{memory}GB/#{size.vcpus}CPU/#{size.disk}GB ($#{size.price_monthly.to_i}/mo)", size.slug
+          end
+        }
+      end
+    else
+      self.size
+    end
+  end
+
+  def ask_node(token)
+    if self.name.nil?
+      nodes = client(token).get("grids/#{current_grid}/nodes")
+      nodes = nodes['nodes'].select{ |n|
+        n['labels'] && n['labels'].include?('provider=digitalocean'.freeze)
+      }
+      raise "Did not find any nodes with label provider=digitalocean" if nodes.size == 0
+      prompt.select("Select node: ") do |menu|
+        nodes.sort_by{|n| n['node_number'] }.reverse.each do |node|
+          initial = node['initial_member'] ? '(initial) ' : ''
+          menu.choice "#{node['name']} #{initial}", node['name']
+        end
+      end
+    else
+      self.name
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-digitalocean
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre1
+  version: 0.2.0.pre2
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-29 00:00:00.000000000 Z
+date: 2016-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kontena-cli
@@ -114,6 +114,7 @@ files:
 - lib/kontena/plugin/digital_ocean/nodes/create_command.rb
 - lib/kontena/plugin/digital_ocean/nodes/restart_command.rb
 - lib/kontena/plugin/digital_ocean/nodes/terminate_command.rb
+- lib/kontena/plugin/digital_ocean/prompts.rb
 - lib/kontena/plugin/digital_ocean_command.rb
 - lib/kontena_cli_plugin.rb
 homepage: https://github.com/kontena/kontena-plugin-digitalocean