kontena-cli 0.13.4 → 0.14.0

data/lib/kontena/cli/master/upcloud_command.rb

@@ -0,0 +1,13 @@
+
+module Kontena::Cli::Master
+
+  require_relative 'upcloud/create_command'
+
+  class UpcloudCommand < Clamp::Command
+
+    subcommand "create", "Create a new Upcloud master", Upcloud::CreateCommand
+
+    def execute
+    end
+  end
+end

data/lib/kontena/cli/master/users/remove_command.rb

@@ -5,10 +5,13 @@ module Kontena::Cli::Master::Users
     include Kontena::Cli::Common
 
     parameter "EMAIL ...", "List of emails"
+    option "--force", :flag, "Force remove", default: false, attribute_name: :forced
 
     def execute
       require_api_url
       token = require_token
+      confirm unless forced?
+
       email_list.each do |email|
         begin
           client(token).delete("users/#{email}")

data/lib/kontena/cli/master/users/roles/remove_command.rb

@@ -6,11 +6,13 @@ module Kontena::Cli::Master::Users::Roles
 
     parameter "ROLE", "Role name"
     parameter "USER ...", "List of users"
+    option "--force", :flag, "Force remove", default: false, attribute_name: :forced
 
 
     def execute
       require_api_url
       token = require_token
+      confirm unless forced?
 
       user_list.each do |email|
         begin

data/lib/kontena/cli/master_command.rb

@@ -1,6 +1,8 @@
 require_relative 'master/vagrant_command'
 require_relative 'master/aws_command'
 require_relative 'master/digital_ocean_command'
+require_relative 'master/packet_command'
+require_relative 'master/upcloud_command'
 require_relative 'master/azure_command'
 require_relative 'master/use_command'
 require_relative 'master/list_command'
@@ -12,6 +14,8 @@ class Kontena::Cli::MasterCommand < Clamp::Command
   subcommand "vagrant", "Vagrant specific commands", Kontena::Cli::Master::VagrantCommand
   subcommand "aws", "AWS specific commands", Kontena::Cli::Master::AwsCommand
   subcommand "digitalocean", "DigitalOcean specific commands", Kontena::Cli::Master::DigitalOceanCommand
+  subcommand "packet", "Packet specific commands", Kontena::Cli::Master::PacketCommand
+  subcommand "upcloud", "Upcloud specific commands", Kontena::Cli::Master::UpcloudCommand
   subcommand "azure", "Azure specific commands", Kontena::Cli::Master::AzureCommand
   subcommand ["list", "ls"], "List masters where client has logged in", Kontena::Cli::Master::ListCommand
   subcommand "use", "Switch to use selected master", Kontena::Cli::Master::UseCommand

data/lib/kontena/cli/node_command.rb

@@ -8,6 +8,8 @@ require_relative 'nodes/label_command'
 
 require_relative 'nodes/vagrant_command'
 require_relative 'nodes/digital_ocean_command'
+require_relative 'nodes/packet_command'
+require_relative 'nodes/upcloud_command'
 require_relative 'nodes/aws_command'
 require_relative 'nodes/azure_command'
 
@@ -23,6 +25,8 @@ class Kontena::Cli::NodeCommand < Clamp::Command
 
   subcommand "vagrant", "Vagrant specific commands", Kontena::Cli::Nodes::VagrantCommand
   subcommand "digitalocean", "DigitalOcean specific commands", Kontena::Cli::Nodes::DigitalOceanCommand
+  subcommand "packet", "Packet specific commands", Kontena::Cli::Nodes::PacketCommand
+  subcommand "upcloud", "Upcloud specific commands", Kontena::Cli::Nodes::UpcloudCommand
   subcommand "aws", "AWS specific commands", Kontena::Cli::Nodes::AwsCommand
   subcommand "azure", "Azure specific commands", Kontena::Cli::Nodes::AzureCommand
 

data/lib/kontena/cli/nodes/azure/create_command.rb

@@ -9,7 +9,6 @@ module Kontena::Cli::Nodes::Azure
     option "--network", "NETWORK", "Virtual Network name"
     option "--subnet", "SUBNET", "Subnet name"
     option "--ssh-key", "SSH KEY", "SSH private key file", required: true
-    option "--password", "PASSWORD", "Password"
     option "--location", "LOCATION", "Location", default: 'West Europe'
     option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
 
@@ -26,7 +25,6 @@ module Kontena::Cli::Nodes::Azure
         master_uri: api_url,
         grid_token: grid['token'],
         grid: current_grid,
-        password: password,
         ssh_key: ssh_key,
         name: name,
         size: size,

data/lib/kontena/cli/nodes/list_command.rb

@@ -31,17 +31,13 @@ module Kontena::Cli::Nodes
         end
       else
         nodes = client(token).get("grids/#{current_grid}/nodes")
-        puts "%-70s %-10s %-40s" % ['Name', 'Status', 'Labels']
+        puts "%-70s %-10s %-10s %-40s" % ['Name', 'Status', 'Initial', 'Labels']
         nodes = nodes['nodes'].sort_by{|n| n['node_number'] }
         nodes.each do |node|
-          if node['connected']
-            status = 'online'
-          else
-            status = 'offline'
-          end
-          puts "%-70.70s %-10s %-40s" % [
+          puts "%-70.70s %-10s %-10s %-40s" % [
             node['name'],
-            status,
+            node['connected'] ? 'online' : 'offline',
+            node['initial_member'] ? 'yes' : 'no',
             (node['labels'] || ['-']).join(",")
           ]
         end

data/lib/kontena/cli/nodes/packet/create_command.rb

@@ -0,0 +1,35 @@
+module Kontena::Cli::Nodes::Packet
+  class CreateCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+
+    parameter "[NAME]", "Node name"
+    option "--token", "TOKEN", "Packet API token", required: true
+    option "--project", "PROJECT ID", "Packet project id", required: true
+    option "--type", "TYPE", "Server type (baremetal_0, baremetal_1, ..)", default: 'baremetal_0', attribute_name: :plan
+    option "--facility", "FACILITY CODE", "Facility", default: 'ams1'
+    option "--billing", "BILLING", "Billing cycle", default: 'hourly'
+    option "--ssh-key", "PATH", "Path to ssh public key (optional)"
+    option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
+
+    def execute
+      require_api_url
+      require_current_grid
+
+      require 'kontena/machine/packet'
+      grid = client(require_token).get("grids/#{current_grid}")
+      provisioner = Kontena::Machine::Packet::NodeProvisioner.new(client(require_token), token)
+      provisioner.run!(
+        master_uri: api_url,
+        grid_token: grid['token'],
+        grid: current_grid,
+        project: project,
+        billing: billing,
+        ssh_key: ssh_key,
+        plan: plan,
+        facility: facility,
+        version: version
+      )
+    end
+  end
+end

data/lib/kontena/cli/nodes/packet/restart_command.rb

@@ -0,0 +1,17 @@
+module Kontena::Cli::Nodes::Packet
+  class RestartCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+
+    parameter "NAME", "Node name"
+    option "--token", "TOKEN", "Packet API token", required: true
+    option "--project", "PROJECT ID", "Packet project id", required: true
+
+    def execute
+      require 'kontena/machine/packet'
+
+      restarter = Kontena::Machine::Packet::NodeRestarter.new(token)
+      restarter.run!(project, name)
+    end
+  end
+end

data/lib/kontena/cli/nodes/packet/terminate_command.rb

@@ -0,0 +1,20 @@
+module Kontena::Cli::Nodes::Packet
+  class TerminateCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+
+    parameter "NAME", "Node name"
+    option "--token", "TOKEN", "Packet API token", required: true
+    option "--project", "PROJECT ID", "Packet project id", required: true
+
+    def execute
+      require_api_url
+      require_current_grid
+
+      require 'kontena/machine/packet'
+      grid = client(require_token).get("grids/#{current_grid}")
+      destroyer = Kontena::Machine::Packet::NodeDestroyer.new(client(require_token), token)
+      destroyer.run!(grid, project, name)
+    end
+  end
+end

data/lib/kontena/cli/nodes/packet_command.rb

@@ -0,0 +1,15 @@
+require_relative 'packet/create_command'
+require_relative 'packet/restart_command'
+require_relative 'packet/terminate_command'
+
+module Kontena::Cli::Nodes
+  class PacketCommand < Clamp::Command
+
+    subcommand "create", "Create a new Packet node", Packet::CreateCommand
+    subcommand "restart", "Restart a Packet node", Packet::RestartCommand
+    subcommand "terminate", "Terminate a Packet node", Packet::TerminateCommand
+
+    def execute
+    end
+  end
+end

data/lib/kontena/cli/nodes/remove_command.rb

@@ -4,11 +4,13 @@ module Kontena::Cli::Nodes
     include Kontena::Cli::GridOptions
 
     parameter "NODE_ID", "Node id"
+    option "--force", :flag, "Force remove", default: false, attribute_name: :forced
 
     def execute
       require_api_url
       require_current_grid
       token = require_token
+      confirm_command(node_id) unless forced?
 
       client(token).delete("grids/#{current_grid}/nodes/#{node_id}")
     end

data/lib/kontena/cli/nodes/show_command.rb

@@ -14,15 +14,17 @@ module Kontena::Cli::Nodes
       node = client(token).get("grids/#{current_grid}/nodes/#{node_id}")
       puts "#{node['name']}:"
       puts "  id: #{node['id']}"
+      puts "  agent version: #{node['agent_version']}"
       puts "  connected: #{node['connected'] ? 'yes': 'no'}"
       puts "  last connect: #{node['updated_at']}"
       puts "  last seen: #{node['last_seen_at']}"
       puts "  public ip: #{node['public_ip']}"
       puts "  private ip: #{node['private_ip']}"
-      puts "  overlay network: 10.81.#{node['node_number']}.0/24"
+      puts "  overlay ip: 10.81.0.#{node['node_number']}"
       puts "  os: #{node['os']}"
       puts "  driver: #{node['driver']}"
       puts "  kernel: #{node['kernel_version']}"
+      puts "  initial node: #{node['initial_member'] ? 'yes' : 'no'}"
       puts "  labels:"
       if node['labels']
         node['labels'].each{|l| puts "    - #{l}"}

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

@@ -0,0 +1,33 @@
+module Kontena::Cli::Nodes::Upcloud
+  class CreateCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+
+    parameter "[NAME]", "Node 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
+    option "--plan", "PLAN", "Server size", default: '1xCPU-1GB'
+    option "--zone", "ZONE", "Zone", default: 'fi-hel1'
+    option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
+
+    def execute
+      require_api_url
+      require_current_grid
+
+      require 'kontena/machine/upcloud'
+      grid = client(require_token).get("grids/#{current_grid}")
+      provisioner = Kontena::Machine::Upcloud::NodeProvisioner.new(client(require_token), username, password)
+      provisioner.run!(
+        master_uri: api_url,
+        grid_token: grid['token'],
+        grid: current_grid,
+        ssh_key: ssh_key,
+        name: name,
+        plan: plan,
+        zone: zone,
+        version: version
+      )
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+module Kontena::Cli::Nodes::Upcloud
+  class RestartCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+
+    parameter "NAME", "Node name"
+    option "--username", "USER", "Upcloud username", required: true
+    option "--password", "PASS", "Upcloud password", required: true
+
+    def execute
+      require_api_url
+      require_current_grid
+
+      require 'kontena/machine/upcloud'
+
+      restarter = Kontena::Machine::Upcloud::NodeRestarter.new(username, password)
+      restarter.run!(name)
+    end
+  end
+end

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

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

data/lib/kontena/cli/nodes/upcloud_command.rb

@@ -0,0 +1,15 @@
+require_relative 'upcloud/create_command'
+require_relative 'upcloud/restart_command'
+require_relative 'upcloud/terminate_command'
+
+module Kontena::Cli::Nodes
+  class UpcloudCommand < Clamp::Command
+
+    subcommand "create", "Create a new Upcloud node", Upcloud::CreateCommand
+    subcommand "restart", "Restart Upcloud node", Upcloud::RestartCommand
+    subcommand "terminate", "Terminate Upcloud node", Upcloud::TerminateCommand
+
+    def execute
+    end
+  end
+end

data/lib/kontena/cli/registry/remove_command.rb

@@ -2,9 +2,12 @@ module Kontena::Cli::Registry
   class RemoveCommand < Clamp::Command
     include Kontena::Cli::Common
 
+    option "--force", :flag, "Force remove", default: false, attribute_name: :forced
+
     def execute
       require_api_url
       token = require_token
+      confirm unless forced?
 
       registry = client(token).get("services/#{current_grid}/registry") rescue nil
       abort("Docker Registry service does not exist") if registry.nil?

data/lib/kontena/cli/services/remove_command.rb

@@ -6,10 +6,12 @@ module Kontena::Cli::Services
     include ServicesHelper
 
     parameter "NAME", "Service name"
+    option "--force", :flag, "Force remove", default: false, attribute_name: :forced
 
     def execute
       require_api_url
       token = require_token
+      confirm_command(name) unless forced?
 
       result = client(token).delete("services/#{parse_service_id(name)}")
     end

data/lib/kontena/cli/services/services_helper.rb

@@ -202,6 +202,7 @@ module Kontena
         # @param [String] name
         def wait_for_deploy_to_finish(token, name)
           ShellSpinner " " do
+            sleep 1 # wait for master to process deploy request and change state to 'deploying'
             until client(token).get("services/#{name}")['state'] != 'deploying' do
               sleep 1
             end

data/lib/kontena/cli/vault/list_command.rb

@@ -5,6 +5,8 @@ module Kontena::Cli::Vault
 
     def execute
       require_api_url
+      require_current_grid
+
       token = require_token
       result = client(token).get("grids/#{current_grid}/secrets")
 

data/lib/kontena/cli/vault/read_command.rb

@@ -7,6 +7,8 @@ module Kontena::Cli::Vault
 
     def execute
       require_api_url
+      require_current_grid
+
       token = require_token
       result = client(token).get("secrets/#{current_grid}/#{name}")
       puts "#{result['name']}:"

data/lib/kontena/cli/vault/remove_command.rb

@@ -4,9 +4,13 @@ module Kontena::Cli::Vault
     include Kontena::Cli::GridOptions
 
     parameter "NAME", "Secret name"
+    option "--force", :flag, "Force remove", default: false, attribute_name: :forced
 
     def execute
       require_api_url
+      require_current_grid
+      confirm_command(name) unless forced?
+
       token = require_token
       client(token).delete("secrets/#{current_grid}/#{name}")
     end

data/lib/kontena/cli/vault/update_command.rb

@@ -4,16 +4,23 @@ module Kontena::Cli::Vault
 
     parameter 'NAME', 'Secret name'
     parameter '[VALUE]', 'Secret value'
+    option ['-u', '--upsert'], :flag, 'Create secret unless already exists', default: false
 
     def execute
       require_api_url
+      require_current_grid
+
       token = require_token
       secret = value
       if secret.to_s == ''
         secret = STDIN.read
       end
       abort('No value provided') if secret.to_s == ''
-      data = {value: secret}
+      data = {
+        name: name,
+        value: secret,
+        upsert: upsert?
+      }
       client(token).put("grids/#{current_grid}/secrets/#{name}", data)
     end
   end