kontena-plugin-cloud 1.2.0.pre1 → 1.2.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dc3a8c3040ed8e7a6b9cbd96270d24839b536afc
-  data.tar.gz: af258da9b87003457ff111d2e484f7f1d44ce645
+SHA256:
+  metadata.gz: e982c9ea1499f2618665e250c4f5c6e2b11511f96c14afc77ef0f288f4e2eaf5
+  data.tar.gz: 009906cfbb8b95082e41823fb62feaa5ed10105237a096fa9805be0628933319
 SHA512:
-  metadata.gz: 9776738f6ee1d8b0299a1dd526d2156f8642487924327e6f1f2e55de5264a14a84dd9ec80791dc8731252ca9581b728ead499c0de3da016b70c57da190282245
-  data.tar.gz: b9a5a54c84f784a5e1b70bbae31d4587e9504169ff043a14974f00be329f6293eaadbc20ead6a05efcc8a07bb5ab66f32b46597c817ee2ebd3343293c5f1b304
+  metadata.gz: 93af9ac05619ca85c45af77e68eead3d048081e7e3d00b593c2bde695ca219a38fb651586bad1572d3f78b4e7e3111df07582262e99b04d51215a67199de3a8f
+  data.tar.gz: 03e5054dda9fc13beda51de24be52ca125e7b329d8a6fe1d3547441b4c8c433182c6894fd479e269e1aaf7b89944b816930c505aa7bb728fa9e608c8c026a3a0

data/lib/kontena/plugin/cloud/node/common.rb

@@ -1,17 +1,9 @@
 require_relative '../../../cli/models/node'
 require_relative '../../../cli/models/platform'
+require_relative 'platform_option'
 
 module Kontena::Plugin::Cloud::Node::Common
 
-  def self.included(base)
-    if base.respond_to?(:option)
-      base.option '--platform', 'PLATFORM', 'Specify Kontena Cloud platform to use' do |platform|
-        config.current_master = platform
-        config.current_grid = platform.split('/')[1]
-      end
-    end
-  end
-
   def compute_client
     @compute_client ||= Kontena::Client.new(compute_url, config.current_account.token, prefix: '/')
   end
@@ -21,7 +13,7 @@ module Kontena::Plugin::Cloud::Node::Common
   end
 
   def compute_url
-    ENV['COMPUTE_URL'] || 'https://compute.kontena.io'
+    ENV['KONTENA_COMPUTE_URL'] || 'https://compute.kontena.io'
   end
 
   def get_platform(org, id)

data/lib/kontena/plugin/cloud/node/create_command.rb

@@ -7,6 +7,7 @@ class Kontena::Plugin::Cloud::Node::CreateCommand < Kontena::Command
   include Kontena::Cli::Common
   include Kontena::Machine::RandomName
   include Kontena::Plugin::Cloud::Node::Common
+  include Kontena::Plugin::Cloud::Node::PlatformOption
   include Kontena::Plugin::Cloud::Organization::Common
   include Kontena::Plugin::Cloud::Platform::Common
 
@@ -17,6 +18,7 @@ class Kontena::Plugin::Cloud::Node::CreateCommand < Kontena::Command
   end
   option "--type", "TYPE", "Node type", required: true
   option "--region", "REGION", "Region (us-east-1, eu-west-1, defaults to current platform region)"
+  option "--ssh-key", "SSH_KEY", "Path to ssh public key"
 
   def execute
     org, platform = parse_platform_name(current_master.name)
@@ -31,6 +33,16 @@ class Kontena::Plugin::Cloud::Node::CreateCommand < Kontena::Command
     name = "#{generate_name}-#{rand(1..999)}"
     node_token = SecureRandom.hex(32)
     target_region = self.region || platform.region
+    ssh_keys = []
+    if ssh_key
+      begin
+        key_path = File.realpath(ssh_key)
+        ssh_keys << File.read(key_path)
+      rescue Errno::ENOENT
+        exit_with_error "ssh key #{ssh_key} does not exist"
+      end
+    end
+
     spinner "Provisioning a node #{pastel.cyan(name)} to platform #{pastel.cyan(platform.to_path)}, region #{pastel.cyan(target_region)}" do
       client.post("grids/#{current_grid}/nodes", {
         name: name,
@@ -46,7 +58,8 @@ class Kontena::Plugin::Cloud::Node::CreateCommand < Kontena::Command
           tokens: {
             grid: token,
             node: node_token
-          }
+          },
+          'ssh-keys': ssh_keys
         },
         relationships: {
           platform: {

data/lib/kontena/plugin/cloud/node/list_command.rb

@@ -11,27 +11,55 @@ class Kontena::Plugin::Cloud::Node::ListCommand < Kontena::Command
 
   requires_current_account_token
 
+  option ['--organization', '--org'], 'ORG', 'Organization', environment_variable: "KONTENA_ORGANIZATION"
+  option ['--quiet', '-q'], :flag, 'Output the identifying column only'
+
   def execute
-    org, platform = parse_platform_name(current_master.name)
-    platform = require_platform("#{org}/#{platform}")
-    nodes = compute_client.get("/organizations/#{org}/nodes")['data']
+    nodes = compute_client.get("/organizations/#{self.organization}/nodes")['data']
     nodes.delete_if { |n| n.dig('attributes', 'state') == 'terminated' }
+    if quiet?
+      puts nodes.map { |n| n.dig('attributes', 'name')}
+      return
+    end
+    platforms = fetch_platforms(nodes)
     print_table(nodes) do |n|
       node = Kontena::Cli::Models::Node.new(n)
       n['name'] = "#{state_icon(node.state)} #{node.name}"
       n['type'] = node.type
       n['region'] = node.region
+      if platform = platforms[node.platform_id]
+        n['platform'] = platform.to_path
+      else
+        n['platform'] = pastel.red('<orphan>')
+      end
     end
   end
 
+  def fetch_platforms(nodes)
+    platform_ids = nodes.map { |n| Kontena::Cli::Models::Node.new(n).platform_id }.compact.uniq
+    platforms = {}
+    platform_ids.each { |id|
+      platform_data = cloud_client.get("/organizations/#{self.organization}/platforms/#{id}")['data'] rescue nil
+      if platform_data
+        platforms[id] = Kontena::Cli::Models::Platform.new(platform_data)
+      end
+    }
+    platforms
+  end
+
   def default_organization
-    prompt_organization
+    unless current_master
+      exit_with_error "Organization is required"
+    end
+    org, _ = parse_platform_name(current_master.name)
+    org
   end
 
   def fields
     {
       'name' => 'name',
       'type' => 'type',
+      'platform' => 'platform',
       'region' => 'region'
     }
   end

data/lib/kontena/plugin/cloud/node/platform_option.rb

@@ -0,0 +1,11 @@
+module Kontena::Plugin::Cloud::Node::PlatformOption
+
+  def self.included(base)
+    if base.respond_to?(:option)
+      base.option '--platform', 'PLATFORM', 'Specify Kontena Cloud platform to use' do |platform|
+        config.current_master = platform
+        config.current_grid = platform.split('/')[1]
+      end
+    end
+  end
+end

data/lib/kontena/plugin/cloud/node/reboot_command.rb

@@ -0,0 +1,35 @@
+require_relative 'common'
+require_relative '../organization/common'
+require_relative '../platform/common'
+
+class Kontena::Plugin::Cloud::Node::RebootCommand < Kontena::Command
+  include Kontena::Cli::Common
+  include Kontena::Plugin::Cloud::Platform::Common
+  include Kontena::Plugin::Cloud::Node::Common
+
+  requires_current_account_token
+
+  option ['--organization', '--org'], 'ORG', 'Organization', environment_variable: "KONTENA_ORGANIZATION"
+  parameter "NAME", "Node name"
+
+  def execute
+    node = find_node(name)
+    exit_with_error "Node not found" unless node
+    spinner "Sending reboot request to #{pastel.cyan(name)}" do
+      compute_client.post("/organizations/#{self.organization}/nodes/#{node.dig('id')}/reboot", {})
+    end
+  end
+
+  def find_node(name)
+    nodes = compute_client.get("/organizations/#{self.organization}/nodes")['data']
+    nodes.find { |n| n.dig('attributes', 'name') == name }
+  end
+
+  def default_organization
+    unless current_master
+      exit_with_error "Organization is required"
+    end
+    org, _ = parse_platform_name(current_master.name)
+    org
+  end
+end

data/lib/kontena/plugin/cloud/node/shell_command.rb

@@ -5,6 +5,7 @@ require_relative '../platform/common'
 class Kontena::Plugin::Cloud::Node::ShellCommand < Kontena::Command
   include Kontena::Cli::Common
   include Kontena::Plugin::Cloud::Platform::Common
+  include Kontena::Plugin::Cloud::Node::PlatformOption
   include Kontena::Plugin::Cloud::Node::Common
 
   requires_current_account_token

data/lib/kontena/plugin/cloud/node/terminate_command.rb

@@ -6,6 +6,7 @@ class Kontena::Plugin::Cloud::Node::TerminateCommand < Kontena::Command
   include Kontena::Cli::Common
   include Kontena::Plugin::Cloud::Platform::Common
   include Kontena::Plugin::Cloud::Node::Common
+  include Kontena::Plugin::Cloud::Node::PlatformOption
 
   requires_current_account_token
 

data/lib/kontena/plugin/cloud/node_command.rb

@@ -3,7 +3,8 @@ class Kontena::Plugin::Cloud::NodeCommand < Kontena::Command
   subcommand ['list', 'ls'], 'List cloud nodes', load_subcommand('kontena/plugin/cloud/node/list_command')
   subcommand ['shell'], 'Jump into node shell', load_subcommand('kontena/plugin/cloud/node/shell_command')
   subcommand ['create'], 'Create cloud node', load_subcommand('kontena/plugin/cloud/node/create_command')
-  subcommand ['terminate'], 'Terminate cloud node', load_subcommand('kontena/plugin/cloud/node/terminate_command')
+  subcommand ['reboot'], 'Reboot cloud node', load_subcommand('kontena/plugin/cloud/node/reboot_command')
+  subcommand ['terminate', 'rm'], 'Terminate cloud node', load_subcommand('kontena/plugin/cloud/node/terminate_command')
 
   def execute
   end

data/lib/kontena/plugin/cloud/platform/create_command.rb

@@ -8,22 +8,31 @@ class Kontena::Plugin::Cloud::Platform::CreateCommand < Kontena::Command
   parameter "[NAME]", "Platform name"
 
   option ['--organization', '--org'], 'ORG', 'Organization name', environment_variable: 'KONTENA_ORGANIZATION'
+  option ['--type'], 'TYPE', 'Platform type (mini, standard)'
   option ['--region'], 'region', 'Region (us-east-1, eu-west-1)'
   option ['--initial-size', '-i'], 'SIZE', 'Initial size (number of nodes) for platform'
   option '--[no-]use', :flag, 'Switch to use created platform', default: true
   option '--version', 'VERSION', 'Platform version', visible: false
 
   def execute
-    confirm("This will create managed platform to Kontena Cloud, proceed?")
-
     self.name = prompt.ask("Name:") unless self.name
     self.organization = prompt_organization unless self.organization
-    self.region = prompt_region unless self.region
-    self.initial_size = prompt_initial_size unless self.initial_size
+    self.type = prompt_type unless self.type
+    if self.type == 'mini' && self.region
+      exit_with_error "mini does not support region selection"
+    elsif self.type == 'mini'
+      self.region = nil
+      self.initial_size = 1 unless self.initial_size
+    else
+      self.region = prompt_region unless self.region
+      self.initial_size = 3 unless self.initial_size
+    end
 
     platform = nil
-    spinner "Creating platform #{pastel.cyan(name)} to region #{pastel.cyan(region)}" do
-      platform = create_platform(name, organization, initial_size, region)
+    spinner_text = "Creating platform #{pastel.cyan(name)}"
+    spinner_text = spinner_text + " to region #{pastel.cyan(region)}" if region
+    spinner spinner_text do
+      platform = create_platform(name, organization, type, initial_size, region)
     end
     spinner "Waiting for platform #{pastel.cyan(name)} to come online" do
       while !platform.online? do
@@ -32,6 +41,11 @@ class Kontena::Plugin::Cloud::Platform::CreateCommand < Kontena::Command
       end
     end
     use_platform(platform) if use?
+
+    puts ""
+    puts "  Platform #{pastel.cyan(name)} needs at least #{pastel.cyan(self.initial_size)} node(s) to be functional."
+    puts "  You can add nodes from Kontena Cloud ('kontena cloud node create --count #{self.initial_size}') or you can bring your own nodes (https://www.kontena.io/docs/using-kontena/install-nodes/)."
+    puts ""
   end
 
   # @param [Kontena::Cli::Models::Platform] platform
@@ -62,17 +76,20 @@ class Kontena::Plugin::Cloud::Platform::CreateCommand < Kontena::Command
     end
   end
 
-  def prompt_initial_size
-    prompt.select("Initial platform size (number of nodes):") do |menu|
-      menu.choice "1 (dev/test)", 1
-      menu.choice "3 (tolerates 1 initial node failure)", 3
-      menu.choice "5 (tolerates 2 initial node failures)", 5
+  def prompt_type
+    prompt.select("Platform type:") do |menu|
+      menu.choice "standard (high-availability, business critical services)", "standard"
+      menu.choice "mini (non-business critical services)", "mini"
     end
   end
 
-  def create_platform(name, organization, initial_size, region)
+  def create_platform(name, organization, type, initial_size, region)
     data = {
-      attributes: { "name" => name, "initial-size" => initial_size },
+      attributes: {
+        "name" => name,
+        "initial-size" => initial_size,
+        "hosted-type" => type
+      },
       relationships: {
         region: {
           "data" => { "type" => "region", "id" => region }

data/lib/kontena/plugin/cloud/platform/list_command.rb

@@ -18,7 +18,7 @@ class Kontena::Plugin::Cloud::Platform::ListCommand < Kontena::Command
       platform = Kontena::Cli::Models::Platform.new(p)
       p['name'] = "#{state_icon(platform.state)} #{organization}/#{platform.name}"
       p['organization'] = platform.organization
-      p['url'] = platform.url
+      p['hosted_type'] = platform.hosted_type
       p['region'] = platform.region
     end
   end
@@ -30,6 +30,7 @@ class Kontena::Plugin::Cloud::Platform::ListCommand < Kontena::Command
   def fields
     {
       name: 'name',
+      type: 'hosted_type',
       region: 'region'
     }
   end

data/lib/kontena/plugin/cloud/platform/show_command.rb

@@ -14,11 +14,11 @@ class Kontena::Plugin::Cloud::Platform::ShowCommand < Kontena::Command
     require_platform(name)
 
     platform = find_platform_by_name(current_platform, current_organization)
-
     puts "#{name}:"
     puts "  name: #{platform.name}"
     puts "  organization: #{current_organization}"
     puts "  version: #{platform.version}"
+    puts "  type: #{platform.hosted_type}"
     puts "  state: #{platform.state}"
     puts "  online: #{platform.online}"
     puts "  region: #{platform.region || '-'}"

data/lib/kontena/plugin/cloud.rb

@@ -1,7 +1,7 @@
 module Kontena
   module Plugin
     module Cloud
-      VERSION = "1.2.0.pre1"
+      VERSION = "1.2.0.pre2"
 
       module Organization
         module User; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-cloud
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre1
+  version: 1.2.0.pre2
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-27 00:00:00.000000000 Z
+date: 2017-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kontena-cli
@@ -78,6 +78,8 @@ files:
 - lib/kontena/plugin/cloud/node/common.rb
 - lib/kontena/plugin/cloud/node/create_command.rb
 - lib/kontena/plugin/cloud/node/list_command.rb
+- lib/kontena/plugin/cloud/node/platform_option.rb
+- lib/kontena/plugin/cloud/node/reboot_command.rb
 - lib/kontena/plugin/cloud/node/shell_command.rb
 - lib/kontena/plugin/cloud/node/terminate_command.rb
 - lib/kontena/plugin/cloud/node_command.rb
@@ -133,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.1
 signing_key: 
 specification_version: 4
 summary: Kontena Cloud management for Kontena CLI