kontena-cli 1.3.5 → 1.4.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: dd4f482967a7d7f9843c3f4192e3602f95a950f179c5997544c6e0e37accfedf
-  data.tar.gz: a9f6ce7ce8c20881cfbfab58dc5bc446bb32d8f23703e8a61f8805c32ed50a47
+SHA1:
+  metadata.gz: 69a344212c91c304c80efd5073e2b3d3e9003b66
+  data.tar.gz: 04ba668d77961f031b6bdd1bad7cbeacab5dfac9
 SHA512:
-  metadata.gz: f1219cf89c19a806cbce2f1ffa477d954cec6c5e23a18bf75d3142aef26b9e3735258c414d03da188ed7e5903d2c43e6e042d5a5b263f99c3fa2306466319893
-  data.tar.gz: 5b7a1bc7d23c736200ca65411bce69a9f6fbf93dc71ea2adb1a01b6eb277a2a52ea36d3edd99522a2961090cd11018ef35adfd67086c32a1d826b2d4a7a0650a
+  metadata.gz: 5fb80753ebfd53b27841cedaa60b2de9af188b6448691b7cc5e9f02410e644d44115b8f873295c7cf2eef823fa929911069d7032ebe5334ffbadd46b52d18b35
+  data.tar.gz: 32129fc7dd6d6ba258238a47799d085d639d5ae0168ee64a90de78756c8984dbfc88885324ce06f5cb4ffe8a76286cb97f119479c3c41e7e4430b6fa6241befc

data/VERSION

@@ -1 +1 @@
-1.3.5
+1.4.0.pre1

data/lib/kontena/cli/etcd/health_command.rb

@@ -26,7 +26,7 @@ module Kontena::Cli::Etcd
         nodes = client.get("grids/#{current_grid}/nodes")['nodes']
 
         nodes.each do |node|
-          node_health = client.get("nodes/#{current_grid}/#{node['name']}/health")
+          node_health = client.get("nodes/#{node['id']}/health")
 
           if !show_node_health(node_health)
             health = false

data/lib/kontena/cli/grids/common.rb

@@ -117,5 +117,56 @@ module Kontena::Cli::Grids
         exit_with_error "No grid given or selected"
       end
     end
+
+    module Parameters
+      def self.included(base)
+        base.option "--default-affinity", "[AFFINITY]", "Default affinity rule for the grid", multivalued: true
+        base.option "--statsd-server", "STATSD_SERVER", "Statsd server address (host:port)"
+        base.option "--log-forwarder", "LOG_FORWARDER", "Set grid wide log forwarder (set to 'none' to disable)"
+        base.option "--log-opt", "[LOG_OPT]", "Set log options (key=value)", multivalued: true
+      end
+
+      def validate_log_opts
+        if !log_opt_list.empty? && log_forwarder.nil?
+          raise Kontena::Errors::StandardError.new(1, "Need to specify --log-forwarder when using --log-opt")
+        end
+      end
+
+      def parse_log_opts
+        opts = {}
+        log_opt_list.each do |opt|
+          key, value = opt.split('=')
+          opts[key.to_sym] = value
+        end
+        opts
+      end
+
+      def validate_grid_parameters
+        validate_log_opts
+      end
+
+      def build_grid_parameters(payload)
+        if statsd_server
+          server, port = statsd_server.split(':')
+          payload[:stats] = {
+            statsd: {
+              server: server,
+              port: port || 8125
+            }
+          }
+        end
+
+        if log_forwarder
+          payload[:logs] = {
+            forwarder: log_forwarder,
+            opts: parse_log_opts
+          }
+        end
+
+        unless default_affinity_list.empty?
+          payload[:default_affinity] = default_affinity_list
+        end
+      end
+    end
   end
 end

data/lib/kontena/cli/grids/create_command.rb

@@ -10,28 +10,32 @@ module Kontena::Cli::Grids
     option "--initial-size", "INITIAL_SIZE", "Initial grid size (number of nodes)", default: 1
     option "--silent", :flag, "Reduce output verbosity"
     option "--token", "[TOKEN]", "Set grid token"
-    option "--default-affinity", "[AFFINITY]", "Default affinity rule for the grid", multivalued: true
     option "--subnet", "[CIDR]", "Configure grid overlay subnet"
     option "--supernet", "[CIDR]", "Configure grid IPAM supernet"
 
+    include Common::Parameters
+
     requires_current_master_token
 
     def execute
+      validate_grid_parameters
+
+      if initial_size == 1
+        warning "Option --initial-size=1 is only recommended for test/dev usage" unless running_silent?
+      end
+
       payload = {
         name: name
       }
       payload[:token] = self.token if self.token
       payload[:initial_size] = self.initial_size if self.initial_size
-      payload[:default_affinity] = self.default_affinity_list unless self.default_affinity_list.empty?
       payload[:subnet] = subnet if subnet
       payload[:supernet] = supernet if supernet
-      
-      grid = nil
-      if initial_size == 1
-        warning "Option --initial-size=1 is only recommended for test/dev usage" unless running_silent?
-      end
-      spinner "Creating #{pastel.cyan(name)} grid " do
-        grid = client.post('grids', payload)
+
+      build_grid_parameters(payload)
+
+      grid = spinner "Creating #{pastel.cyan(name)} grid " do
+        client.post('grids', payload)
       end
       if grid
         spinner "Switching scope to #{pastel.cyan(name)} grid " do

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

@@ -6,63 +6,30 @@ module Kontena::Cli::Grids
     include Common
 
     parameter "NAME", "Grid name"
-    option "--statsd-server", "STATSD_SERVER", "Statsd server address (host:port)"
-    option "--no-statsd-server", :flag, "Unset statsd server setting"
-    option "--default-affinity", "[AFFINITY]", "Default affinity rule for the grid", multivalued: true
+
+    include Common::Parameters
+
     option "--no-default-affinity", :flag, "Unset grid default affinity"
-    option "--log-forwarder", "LOG_FORWARDER", "Set grid wide log forwarder (set to 'none' to disable)"
-    option "--log-opt", "[LOG_OPT]", "Set log options (key=value)", multivalued: true
+    option "--no-statsd-server", :flag, "Unset statsd server setting"
+
+    requires_current_master_token
 
     def execute
-      require_api_url
-      token = require_token
-      validate_log_opts
+      validate_grid_parameters
+
       payload = {}
-      if statsd_server
-        server, port = statsd_server.split(':')
-        payload[:stats] = {
-          statsd: {
-            server: server,
-            port: port || 8125
-          }
-        }
-      end
+
+      build_grid_parameters(payload)
 
       if no_statsd_server?
         payload[:stats] = { statsd:  nil }
       end
 
-      if log_forwarder
-        payload[:logs] = {
-          forwarder: log_forwarder,
-          opts: parse_log_opts
-        }
-      end
-
-      unless default_affinity_list.empty?
-        payload[:default_affinity] = default_affinity_list
-      end
-
       if no_default_affinity?
         payload[:default_affinity] = []
       end
 
-      client(token).put("grids/#{name}", payload)
-    end
-
-    def validate_log_opts
-      if !log_opt_list.empty? && log_forwarder.nil?
-        raise Kontena::Errors::StandardError.new(1, "Need to specify --log-forwarder when using --log-opt")
-      end
-    end
-
-    def parse_log_opts
-      opts = {}
-      log_opt_list.each do |opt|
-        key, value = opt.split('=')
-        opts[key.to_sym] = value
-      end
-      opts
+      client.put("grids/#{name}", payload)
     end
   end
 end

data/lib/kontena/cli/node_command.rb

@@ -3,10 +3,13 @@ class Kontena::Cli::NodeCommand < Kontena::Command
   subcommand ["list","ls"], "List grid nodes", load_subcommand('nodes/list_command')
   subcommand "show", "Show node", load_subcommand('nodes/show_command')
   subcommand "ssh", "Ssh into node", load_subcommand('nodes/ssh_command')
+  subcommand "create", "Create node", load_subcommand('nodes/create_command')
   subcommand "update", "Update node", load_subcommand('nodes/update_command')
+  subcommand "reset-token", "Reset node token for agent websocket connection", load_subcommand('nodes/reset_token_command')
   subcommand ["remove","rm"], "Remove node", load_subcommand('nodes/remove_command')
   subcommand "label", "Node label specific commands", load_subcommand('nodes/label_command')
   subcommand "health", "Check node health", load_subcommand('nodes/health_command')
+  subcommand "env", "Generate kontena-agent.env configuration", load_subcommand('nodes/env_command')
 
   def execute
   end

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

@@ -0,0 +1,25 @@
+module Kontena::Cli::Nodes
+  class CreateCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+
+    requires_current_master
+    requires_current_master_token
+    requires_current_grid
+
+    parameter "NAME", "Node name"
+    option ["--token"], "TOKEN", "Node token"
+    option ["-l", "--label"], "LABEL", "Node label", multivalued: true
+
+    def execute
+      data = { name: name }
+
+      data[:token] = token if token
+      data[:labels] = label_list
+
+      spinner "Creating #{name.colorize(:cyan)} node " do
+        client.post("grids/#{current_grid}/nodes", data)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+module Kontena::Cli::Nodes
+  class EnvCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+
+    requires_current_master
+    requires_current_master_token
+    requires_current_grid
+
+    parameter "NAME", "Node name"
+    option ['--token'], :flag, 'Only show token', default: false
+
+    def grid_uri
+      grid_uri = self.current_master['url'].sub('http', 'ws')
+    end
+
+    def execute
+      token_node = client.get("nodes/#{current_grid}/#{name}/token")
+
+      unless token_node['token']
+        exit_with_error "Node #{name} was not created with a node token. Use `kontena grid env` instead"
+      end
+
+      if self.token?
+        puts token_node['token']
+      else
+        puts "KONTENA_URI=#{grid_uri}"
+        puts "KONTENA_NODE_TOKEN=#{token_node['token']}"
+      end
+    end
+  end
+end

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

@@ -6,14 +6,14 @@ module Kontena::Cli::Nodes
     include Kontena::Cli::GridOptions
     include Kontena::Cli::Helpers::HealthHelper
 
-    parameter "NODE_ID", "Node id"
+    parameter "NODE", "Node name"
 
     def execute
       require_api_url
       require_current_grid
       token = require_token
 
-      node = client(token).get("nodes/#{current_grid}/#{node_id}")
+      node = client(token).get("nodes/#{current_grid}/#{self.node}")
 
       return show_node_health(node)
     end

data/lib/kontena/cli/nodes/labels/add_command.rb

@@ -2,7 +2,7 @@ module Kontena::Cli::Nodes::Labels
   class AddCommand < Kontena::Command
     include Kontena::Cli::Common
 
-    parameter "NODE_ID", "Node id"
+    parameter "NODE", "Node name"
     parameter "LABEL ...", "Labels"
 
     requires_current_master
@@ -10,9 +10,9 @@ module Kontena::Cli::Nodes::Labels
     requires_current_grid
 
     def execute
-      node = client.get("nodes/#{current_grid}/#{node_id}")
+      node = client.get("nodes/#{current_grid}/#{self.node}")
       data = { labels: (Array(node['labels']) + label_list).uniq }
-      client.put("nodes/#{current_grid}/#{node_id}", data)
+      client.put("nodes/#{node['id']}", data)
     end
   end
 end

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

@@ -2,7 +2,7 @@ module Kontena::Cli::Nodes::Labels
   class ListCommand < Kontena::Command
     include Kontena::Cli::Common
 
-    parameter "NODE_ID", "Node id"
+    parameter "NODE", "Node name"
 
     # the command outputs id info only anyway, this is here strictly for ignoring purposes
     option ['-q', '--quiet'], :flag, "Output the identifying column only", hidden: true
@@ -12,7 +12,7 @@ module Kontena::Cli::Nodes::Labels
     requires_current_grid
 
     def execute
-      node = client.get("nodes/#{current_grid}/#{node_id}")
+      node = client.get("nodes/#{current_grid}/#{self.node}")
       puts Array(node['labels']).join("\n")
     end
   end

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

@@ -2,7 +2,7 @@ module Kontena::Cli::Nodes::Labels
   class RemoveCommand < Kontena::Command
     include Kontena::Cli::Common
 
-    parameter "NODE_ID", "Node id"
+    parameter "NODE", "Node name"
     parameter "LABEL ...", "Labels"
 
     requires_current_master
@@ -10,9 +10,9 @@ module Kontena::Cli::Nodes::Labels
     requires_current_grid
 
     def execute
-      node = client.get("nodes/#{current_grid}/#{node_id}")
+      node = client.get("nodes/#{current_grid}/#{self.node}")
       data = { labels: Array(node['labels']).reject {|label| label_list.include?(label) } }
-      client.put("nodes/#{current_grid}/#{node['id']}", data)
+      client.put("nodes/#{node['id']}", data)
     end
   end
 end

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

@@ -3,7 +3,7 @@ module Kontena::Cli::Nodes
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
 
-    parameter "NODE_ID", "Node id"
+    parameter "NODE", "Node name"
     option "--force", :flag, "Force remove", default: false, attribute_name: :forced
 
     def execute
@@ -11,16 +11,18 @@ module Kontena::Cli::Nodes
       require_current_grid
       token = require_token
 
-      node = client(token).get("nodes/#{current_grid}/#{node_id}")
+      node = client(token).get("nodes/#{current_grid}/#{self.node}")
 
-      if node['connected']
-        exit_with_error "Node #{node['name']} is still online. You must terminate the node before removing it."
+      if node['has_token'] && node['connected']
+        warning "Node #{node['name']} is still connected using a node token, but will be force-disconnected"
+      elsif node['connected']
+        exit_with_error "Node #{node['name']} is still connected using a grid token. You must terminate the node before removing it."
       end
 
-      confirm_command(node_id) unless forced?
+      confirm_command(self.node) unless forced?
 
-      spinner "Removing #{node_id.colorize(:cyan)} node from #{current_grid.colorize(:cyan)} grid " do
-        client(token).delete("nodes/#{current_grid}/#{node_id}")
+      spinner "Removing #{self.node.colorize(:cyan)} node from #{current_grid.colorize(:cyan)} grid " do
+        client(token).delete("nodes/#{node['id']}")
       end
     end
   end

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

@@ -0,0 +1,31 @@
+module Kontena::Cli::Nodes
+  class ResetTokenCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+
+    requires_current_master
+    requires_current_master_token
+    requires_current_grid
+
+    parameter "NODE", "Node name"
+
+    option ["--token"], "TOKEN", "Use given node token instead of generating a random token"
+    option ["--clear-token"], :flag, "Clear node token, reverting to grid token"
+    option "--[no-]reset-connection", :flag, "Reset agent websocket connection", default: true
+    option "--force", :flag, "Force token update"
+
+    def execute
+      confirm("Resetting the node token will disconnect the agent (unless using --no-reset-connection), and require you to reconfigure the kontena-agent using the new `kontena node env` values before it will be able to reconnect. Are you sure?")
+
+      data = {}
+
+      data[:token] = self.token
+      data[:token] = '' if self.clear_token?
+      data[:reset_connection] = self.reset_connection?
+
+      spinner "Resetting node #{self.node.colorize(:cyan)} websocket connection token" do
+        client.put("nodes/#{current_grid}/#{self.node}/token", data)
+      end
+    end
+  end
+end

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

@@ -4,16 +4,16 @@ module Kontena::Cli::Nodes
     include Kontena::Cli::GridOptions
     include Kontena::Cli::BytesHelper
 
-    parameter "NODE_ID", "Node id"
+    parameter "NODE", "Node name"
 
     def execute
       require_api_url
       require_current_grid
       token = require_token
 
-      node = client(token).get("nodes/#{current_grid}/#{node_id}")
-      puts "#{node['name']}:"
-      puts "  id: #{node['id']}"
+      node = client(token).get("nodes/#{current_grid}/#{self.node}")
+      puts "#{node['id']}:"
+      puts "  id: #{node['node_id']}"
       puts "  agent version: #{node['agent_version']}"
       puts "  docker version: #{node['docker_version']}"
       puts "  connected: #{node['connected'] ? 'yes': 'no'}"