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

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmE3N2JkNzNjMWYwZDlhZjhjM2VmYmNiYjIzYjljNDUxMzY1Mjc0YQ==
+    MWJkMTY1MThhNDQ4ZmUyMzI0NTE1NTJkZjFhNGVmNTQ1MjY4NjA5YQ==
   data.tar.gz: !binary |-
-    YmEwNTgzZjBiYzE0OTkxMWFjNjJjMzJhYWI5YzhlNjJmMTg3NjBkZg==
+    OWFhMWJkZWQyZmFlNTE5MmVkZTJiYTI3ZDYyYjE2M2JjYjEzZGIxMw==
 SHA512:
   metadata.gz: !binary |-
-    MTQ4MjNlNjM2Nzc2MzM4N2U4NzgyNTg0ZDgyYjYyZWVlODEzZTlmZjk4ZGU3
-    ZWVjMmNjYjNjZjk0Y2ZjYzRkYmJjN2NjZDkzMzA0ODM1NzczMzEwZWI2MjY0
-    NjQ1OWY0MTZhMjRmZGViM2ZmMGUyZDFmYzdhODg4ZmY4NDIxZDI=
+    ODNlNWQxOGNhMmQwNmI4MDhkMDkzMDBmNjJjYTYwN2ZiMDBkODg0ZGRjODVm
+    ZTM3OGNjYjE1NWQyYWMwMGMzMmNmYmViYjU1Y2MzZTY3YTIzM2I5NDMzZTQx
+    ZDY3ZTY4Njk0ZjRmOTkzNWIyOTE5YmJiMmE1MTliM2U3ZDA3MzA=
   data.tar.gz: !binary |-
-    ZTk1YWQzNDc4YjIxNzEyNjY0MjZmN2Q3Y2YyMDBiY2IyZDE0OWYzYjNlNjBi
-    Y2ZjNTc5MWM3N2I3YmMzOGUwYzkzZjUzOGVhYTNhMjc2ZjhiNjIzNjM2ZmFl
-    OTUxODE0MWRiNGRmOTgwNDQ4OWRjMGI0ZDYzNTM5ODg3ZGVhZDA=
+    NDM0NTdkN2MyYzhiNzgzNTBlMmE4MzI5YjcyODdiM2I5MTY3YmY2YTM0Njdm
+    YmRjNGRlNzIyYzJkMjVhOTRkY2RiOTNkMjQ1MTJlOTZlMTk1ZjdjY2I1NGEy
+    OWQ3NWI5ZmEyY2VlMDg5OWViZjU3OWQzN2VjZWZmZDUwYmZlZDc=

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

@@ -89,11 +89,11 @@ 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}

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

@@ -1,7 +1,6 @@
 require 'fileutils'
 require 'erb'
 require 'open3'
-require 'shell-spinner'
 
 module Kontena
   module Machine
@@ -10,7 +9,7 @@ module Kontena
         include RandomName
         include Machine::CertHelper
         include UpcloudCommon
-        include Kontena::Cli::ShellSpinner
+        include Kontena::Cli::Common
 
         attr_reader :http_client, :username, :password
 
@@ -31,7 +30,7 @@ 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
-            spinner "* Generating self-signed SSL certificate" do
+            spinner "Generating self-signed SSL certificate" do
               ssl_cert = generate_self_signed_cert
             end
           end
@@ -42,17 +41,26 @@ module Kontena
           abort('Server plan not found on Upcloud') unless plan = find_plan(opts[:plan])
           abort('Zone not found on Upcloud') unless zone_exist?(opts[:zone])
 
-          hostname = generate_name
+          if opts[:name]
+            server_name = opts[:name]
+            hostname = opts[:name].start_with?('kontena-master') ? opts[:name] : "kontena-master-#{opts[:name]}"
+          else
+            hostname = generate_name
+            server_name = hostname.sub('kontena-master-', '')
+          end
+
+          server_name = opts[:name] 
+          hostname = opts[:name] || generate_name
 
           userdata_vars = opts.merge(
               ssl_cert: ssl_cert,
-              server_name: hostname.sub('kontena-master-', '')
+              server_name: server_name
           )
 
           device_data = {
             server: {
               zone: opts[:zone],
-              title: "Kontena Master #{hostname}",
+              title: "Kontena Master #{server_name}",
               hostname: hostname,
               plan: plan[:name],
               vnc: 'off',
@@ -80,7 +88,7 @@ module Kontena
             }
           }.to_json
 
-          spinner "* Creating Upcloud master #{hostname.colorize(:cyan)} " do
+          spinner "Creating Upcloud master #{hostname.colorize(:cyan)} " do
             response = post('server', body: device_data)
             if response.has_key?(:error)
               abort("\nUpcloud server creation failed (#{response[:error].fetch(:error_message, '')})")
@@ -103,16 +111,14 @@ module Kontena
           Excon.defaults[:ssl_verify_peer] = false
           @http_client = Excon.new("#{master_url}", :connect_timeout => 10)
 
-          spinner "* Waiting for #{hostname.colorize(:cyan)} to start" do
-            sleep 5 until master_running?
+          spinner "Waiting for #{hostname.colorize(:cyan)} to start" do
+            sleep 1 until master_running?
           end
 
-          puts
-          puts "Kontena Master is now running at #{master_url}".colorize(:green)
-          puts
+          vfakespinner "Kontena Master is now running at #{master_url}"
 
           {
-            name: hostname.sub('kontena-master-', ''),
+            name: server_name,
             public_ip: device_public_ip[:address],
             code: opts[:initial_admin_code]
           }

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

@@ -55,13 +55,13 @@ module Kontena
               end
             end
 
-            ShellSpinner "Terminating Upcloud node #{name.colorize(:cyan)} " do
+            spinner "Terminating Upcloud node #{name.colorize(:cyan)} " do
               response = delete("server/#{server[:uuid]}")
               abort "Cannot delete node #{name.colorize(:cyan)} in Upcloud" unless response[:success]
             end
 
             storage_uuids.each do |uuid|
-              ShellSpinner "Deleting Upcloud storage device '#{uuid.colorize(:cyan)}' " do
+              spinner "Deleting Upcloud storage device '#{uuid.colorize(:cyan)}' " do
                 response = delete("storage/#{uuid}")
                 unless response[:success]
                   puts "#{"WARNING".colorize(:red)}: Couldn't delete Upcloud storage '#{uuid.colorize(:cyan)}', check manually."
@@ -73,7 +73,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/upcloud/upcloud_common.rb

@@ -9,8 +9,8 @@ module Kontena
         attr_reader :username
         attr_reader :password
         
-        def client
-          @client ||= Excon.new(
+        def upcloud_client
+          @upcloud_client ||= Excon.new(
             'https://api.upcloud.com',
             omit_default_port: true,
             user: username,
@@ -49,15 +49,13 @@ module Kontena
         end
 
         [:get, :post, :delete].each do |http_method|
-          define_method http_method do |path, opts={}|
-            response = client.send(
-              http_method, 
-              opts.merge(
+          define_method http_method do |path, options={}|
+            response = upcloud_client.send(
+              http_method,
+              { 
                 path: File.join('/1.2', path),
-                headers: {
-                  'Content-Type': 'application/json'
-                }
-              )
+                headers: { 'Content-Type' => 'application/json' }
+              }.merge(options)
             )
             if response.body && response.body.start_with?('{')
               JSON.parse(response.body, symbolize_names: true)

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

@@ -1,9 +1,10 @@
 require 'securerandom'
 
 module Kontena::Plugin::Upcloud::Master
-  class CreateCommand < Clamp::Command
+  class CreateCommand < Kontena::Command
     include Kontena::Cli::Common
-    
+
+    option "--name", "[NAME]", "Set Kontena Master name"
     option "--username", "USER", "Upcloud username", required: true
     option "--password", "PASS", "Upcloud password", required: true
     option "--ssh-key", "SSH_KEY", "Path to ssh public key", required: true
@@ -17,10 +18,11 @@ module Kontena::Plugin::Upcloud::Master
 
     def execute
 
-      require 'kontena/machine/upcloud'
+      require_relative '../../../machine/upcloud'
 
       provisioner = Kontena::Machine::Upcloud::MasterProvisioner.new(username, password)
       provisioner.run!(
+          name: self.name,
           ssh_key: ssh_key,
           ssl_cert: ssl_cert,
           plan: plan,

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

@@ -1,5 +1,5 @@
 module Kontena::Plugin::Upcloud::Nodes
-  class CreateCommand < Clamp::Command
+  class CreateCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
 
@@ -11,13 +11,12 @@ module Kontena::Plugin::Upcloud::Nodes
     option "--zone", "ZONE", "Zone", default: 'fi-hel1'
     option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
 
-    def execute
-      require_api_url
-      require_current_grid
+    requires_current_master_token
 
-      require 'kontena/machine/upcloud'
+    def execute
+      require_relative '../../../machine/upcloud'
       grid = fetch_grid
-      provisioner = Kontena::Machine::Upcloud::NodeProvisioner.new(client(require_token), username, password)
+      provisioner = Kontena::Machine::Upcloud::NodeProvisioner.new(client, username, password)
       provisioner.run!(
         master_uri: api_url,
         grid_token: grid['token'],
@@ -33,7 +32,7 @@ module Kontena::Plugin::Upcloud::Nodes
     # @param [String] id
     # @return [Hash]
     def fetch_grid
-      client(require_token).get("grids/#{current_grid}")
+      client.get("grids/#{current_grid}")
     end
 
   end

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

@@ -1,5 +1,5 @@
 module Kontena::Plugin::Upcloud::Nodes
-  class RestartCommand < Clamp::Command
+  class RestartCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
 

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

@@ -1,5 +1,5 @@
 module Kontena::Plugin::Upcloud::Nodes
-  class TerminateCommand < Clamp::Command
+  class TerminateCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
 
@@ -7,13 +7,12 @@ module Kontena::Plugin::Upcloud::Nodes
     option "--username", "USER", "Upcloud username", required: true
     option "--password", "PASS", "Upcloud password", required: true
 
-    def execute
-      require_api_url
-      require_current_grid
+    requires_current_master_token
 
-      require 'kontena/machine/upcloud'
-      grid = client(require_token).get("grids/#{current_grid}")
-      destroyer = Kontena::Machine::Upcloud::NodeDestroyer.new(client(require_token), username, password)
+    def execute
+      require_relative '../../../machine/upcloud'
+      grid = client.get("grids/#{current_grid}")
+      destroyer = Kontena::Machine::Upcloud::NodeDestroyer.new(client, username, password)
       destroyer.run!(grid, name)
     end
   end

data/lib/kontena/plugin/upcloud.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-upcloud
 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-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kontena-cli