kontena-plugin-digitalocean 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: deadff953354c92fab1891f6e1fca0f725120205
-  data.tar.gz: 9b54bb0396371c0c79d19db0274c52fcc80ad720
+  metadata.gz: 1bb6451500eb7cd117546fb2f5079745ea23773f
+  data.tar.gz: 5383038aeb7fa4a3e638d40a4d93b9d4ecb2f9f4
 SHA512:
-  metadata.gz: a51766a402fcc963ef828b887c7c0035d75c90bc37b4dedd6fda06cc55272f3897324c07a7598c7c8810b46fbf37e5a3d6378164fcc33a874618d9efdae7931c
-  data.tar.gz: abf406883e010a9b9d068730ec438819cba343b45a79cb95fb32abc35df4deefbb886a7f42796a35f46f202e67123b27e48f53e04a73716e5c9ebbdf31b99235
+  metadata.gz: 071c61535e2a8ba9caf1f39a06ba95828b338bf69a61d937828f6c1d5592dd1853efe4adaa9d10661bb6a20b1837b0e905c126e0fe27159c056963321fd0d0c7
+  data.tar.gz: 0d7d1e867703e1a800696d1421fa67062fc7663c38f161e4e67103b273b692fc29727c02d0594d03b46451fd8250bedc43f157cec823939c517c47ddbe96eb9d

data/kontena-plugin-digitalocean.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency 'kontena-cli', '>= 1.0'
-  spec.add_runtime_dependency 'droplet_kit', '~> 1.4', '>= 1.4.1'
+  spec.add_runtime_dependency 'droplet_kit', '~> 2.0', '>= 2.0.1'
   spec.add_runtime_dependency 'activesupport', '~> 4.0'
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/kontena/machine/digital_ocean.rb

@@ -4,3 +4,4 @@ require 'kontena/machine/cert_helper'
 require_relative 'digital_ocean/node_provisioner'
 require_relative 'digital_ocean/node_destroyer'
 require_relative 'digital_ocean/master_provisioner'
+require_relative 'digital_ocean/master_destroyer'

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

@@ -11,7 +11,7 @@ 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=--insecure-registry="10.81.0.0/16" --bip="172.17.43.1/16" -s overlay2'
         Environment='DOCKER_CGROUPS=--exec-opt native.cgroupdriver=cgroupfs'
   - path: /etc/sysctl.d/99-inotify.conf
     owner: root

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

@@ -0,0 +1,30 @@
+module Kontena
+  module Machine
+    module DigitalOcean
+      class MasterDestroyer
+        include Kontena::Cli::ShellSpinner
+
+        attr_reader :client, :api_client
+
+        # @param [String] token Digital Ocean token
+        def initialize(token)
+          @client = DropletKit::Client.new(access_token: token)
+        end
+
+        def run!(name)
+          droplet = client.droplets.all.find{|d| d.name == name}
+          if droplet
+            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"
+              end
+            end
+          else
+            abort "Cannot find droplet #{name.colorize(:cyan)} in DigitalOcean"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -32,10 +32,10 @@ module Kontena
             end
           end
 
-          name = generate_name
+          name = opts[:name]
           userdata_vars = opts.merge(
               ssl_cert: ssl_cert,
-              server_name: name.sub('kontena-master-', '')
+              server_name: name
           )
 
           droplet = DropletKit::Droplet.new(
@@ -45,7 +45,8 @@ module Kontena
               size: opts[:size],
               private_networking: true,
               user_data: user_data(userdata_vars),
-              ssh_keys: [ssh_key.id]
+              ssh_keys: [ssh_key.id],
+              tags: ['master']
           )
 
           spinner "Creating DigitalOcean droplet #{droplet.name.colorize(:cyan)} " do
@@ -88,10 +89,6 @@ module Kontena
           erb(File.read(cloudinit_template), vars)
         end
 
-        def generate_name
-          "kontena-master-#{super}-#{rand(1..9)}"
-        end
-
         def ssh_key(public_key)
           client.ssh_keys.all.find{|key| key.public_key == public_key}
         end

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

@@ -29,16 +29,18 @@ module Kontena
             master_uri: opts[:master_uri],
             grid_token: opts[:grid_token],
           }
+          image = "coreos-#{opts[:channel]}"
           droplets = []
           opts[:count].to_i.times do
             droplet = DropletKit::Droplet.new(
               name: opts[:name] || generate_name,
               region: opts[:region],
-              image: 'coreos-stable',
+              image: image,
               size: opts[:size],
               private_networking: true,
               user_data: user_data(userdata_vars),
-              ssh_keys: [ssh_key.id]
+              ssh_keys: [ssh_key.id],
+              tags: [opts[:grid]]
             )
             created = client.droplets.create(droplet)
             spinner "Creating DigitalOcean droplet #{droplet.name.colorize(:cyan)} " do

data/lib/kontena/plugin/digital_ocean.rb

@@ -1,7 +1,7 @@
 module Kontena
   module Plugin
     module DigitalOcean
-      VERSION = "0.2.5"
+      VERSION = "0.3.0"
     end
   end
 end

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

@@ -7,7 +7,7 @@ module Kontena::Plugin::DigitalOcean::Master
     include Kontena::Plugin::DigitalOcean::Prompts
 
     option "--name", "[NAME]", "Set master name"
-    option "--token", "TOKEN", "DigitalOcean API token", environment_variable: "DO_TOKEN" 
+    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'
@@ -28,15 +28,16 @@ module Kontena::Plugin::DigitalOcean::Master
 
       provisioner = provisioner(do_token)
       provisioner.run!(
-          ssh_key: ssh_key,
-          ssl_cert: ssl_cert,
-          size: do_size,
-          region: do_region,
-          version: version,
-          vault_secret: vault_secret || SecureRandom.hex(24),
-          vault_iv: vault_iv || SecureRandom.hex(24),
-          initial_admin_code: SecureRandom.hex(16),
-          mongodb_uri: mongodb_uri
+        name: name,
+        ssh_key: ssh_key,
+        ssl_cert: ssl_cert,
+        size: do_size,
+        region: do_region,
+        version: version,
+        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/master/terminate_command.rb

@@ -0,0 +1,25 @@
+module Kontena::Plugin::DigitalOcean::Master
+  class TerminateCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+    include Kontena::Plugin::DigitalOcean::Prompts
+
+    parameter "NAME", "Master name"
+    option "--token", "TOKEN", "DigitalOcean API token", environment_variable: "DO_TOKEN"
+    option "--force", :flag, "Force remove", default: false, attribute_name: :forced
+
+    def execute
+      do_token = ask_do_token
+      confirm_command(name) unless forced?
+
+      require_relative '../../../machine/digital_ocean'
+      destroyer = destroyer(do_token)
+      destroyer.run!(name)
+    end
+
+    # @param [String] token
+    def destroyer(token)
+      Kontena::Machine::DigitalOcean::MasterDestroyer.new(token)
+    end
+  end
+end

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

@@ -1,8 +1,10 @@
 require_relative 'master/create_command'
+require_relative 'master/terminate_command'
 
 class Kontena::Plugin::DigitalOcean::MasterCommand < Kontena::Command
 
   subcommand "create", "Create a new master to DigitalOcean", Kontena::Plugin::DigitalOcean::Master::CreateCommand
+  subcommand "terminate", "Terminate DigitalOcean master", Kontena::Plugin::DigitalOcean::Master::TerminateCommand
 
   def execute
   end

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

@@ -13,6 +13,7 @@ module Kontena::Plugin::DigitalOcean::Nodes
     option "--size", "SIZE", "Droplet size"
     option "--count", "COUNT", "How many droplets to create"
     option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
+    option "--channel", "CHANNEL", "Define CoreOS image channel"
 
     def execute
       require_api_url
@@ -23,6 +24,7 @@ module Kontena::Plugin::DigitalOcean::Nodes
       require_relative '../../../machine/digital_ocean'
 
       do_region = ask_droplet_region(do_token)
+      coreos_channel = self.channel || ask_channel
       do_size = ask_droplet_size(do_token, do_region)
       do_count = ask_droplet_count
 
@@ -37,7 +39,8 @@ module Kontena::Plugin::DigitalOcean::Nodes
         size: do_size,
         count: do_count,
         region: do_region,
-        version: version
+        version: version,
+        channel: coreos_channel
       )
     end
 

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

@@ -53,4 +53,12 @@ module Kontena::Plugin::DigitalOcean::Prompts
       self.name
     end
   end
+
+  def ask_channel
+    prompt.select('Select CoreOS channel') do |menu|
+      menu.choice 'Stable', 'stable'
+      menu.choice 'Beta', 'beta'
+      menu.choice 'Alpha', 'alpha'
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-digitalocean
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-03 00:00:00.000000000 Z
+date: 2017-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kontena-cli
@@ -30,20 +30,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -104,11 +104,13 @@ files:
 - lib/kontena/machine/digital_ocean.rb
 - lib/kontena/machine/digital_ocean/cloudinit.yml
 - lib/kontena/machine/digital_ocean/cloudinit_master.yml
+- lib/kontena/machine/digital_ocean/master_destroyer.rb
 - lib/kontena/machine/digital_ocean/master_provisioner.rb
 - lib/kontena/machine/digital_ocean/node_destroyer.rb
 - lib/kontena/machine/digital_ocean/node_provisioner.rb
 - lib/kontena/plugin/digital_ocean.rb
 - lib/kontena/plugin/digital_ocean/master/create_command.rb
+- lib/kontena/plugin/digital_ocean/master/terminate_command.rb
 - lib/kontena/plugin/digital_ocean/master_command.rb
 - lib/kontena/plugin/digital_ocean/node_command.rb
 - lib/kontena/plugin/digital_ocean/nodes/create_command.rb