kontena-cli 0.16.3 → 0.17.0.pre1

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

@@ -2,9 +2,11 @@ module Kontena::Cli::Nodes
 
   require_relative 'labels/add_command'
   require_relative 'labels/remove_command'
+  require_relative 'labels/list_command'
 
   class LabelCommand < Kontena::Command
 
+    subcommand ["list", "ls"], "List node labels", Labels::ListCommand
     subcommand "add", "Add label to node", Labels::AddCommand
     subcommand ["remove", "rm"], "Remove label from node", Labels::RemoveCommand
 

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

@@ -3,16 +3,15 @@ module Kontena::Cli::Nodes::Labels
     include Kontena::Cli::Common
 
     parameter "NODE_ID", "Node id"
-    parameter "LABEL", "Label"
+    parameter "LABEL ...", "Labels"
 
-    def execute
-      require_api_url
-      require_current_grid
-      token = require_token
+    requires_current_master
+    requires_current_master_token
+    requires_current_grid
 
-      node = client(token).get("grids/#{current_grid}/nodes/#{node_id}")
-      data = {}
-      data[:labels] = node['labels'].to_a | [label]
+    def execute
+      node = client.get("grids/#{current_grid}/nodes/#{node_id}")
+      data = { labels: (Array(node['labels']) + label_list).uniq }
       client.put("nodes/#{node['id']}", data, {}, {'Kontena-Grid-Token' => node['grid']['token']})
     end
   end

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

@@ -0,0 +1,17 @@
+module Kontena::Cli::Nodes::Labels
+  class ListCommand < Kontena::Command
+    include Kontena::Cli::Common
+
+    parameter "NODE_ID", "Node id"
+
+    requires_current_master
+    requires_current_master_token
+    requires_current_grid
+
+    def execute
+      node = client.get("grids/#{current_grid}/nodes/#{node_id}")
+      puts Array(node['labels']).join("\n")
+    end
+  end
+end
+

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

@@ -3,20 +3,15 @@ module Kontena::Cli::Nodes::Labels
     include Kontena::Cli::Common
 
     parameter "NODE_ID", "Node id"
-    parameter "LABEL", "Label"
+    parameter "LABEL ...", "Labels"
 
-    def execute
-      require_api_url
-      require_current_grid
-      token = require_token
+    requires_current_master
+    requires_current_master_token
+    requires_current_grid
 
-      node = client(token).get("grids/#{current_grid}/nodes/#{node_id}")
-      unless node['labels'].include?(label)
-        exit_with_error("Node #{node['name']} does not have label #{label}")
-      end
-      node['labels'].delete(label)
-      data = {}
-      data[:labels] = node['labels']
+    def execute
+      node = client.get("grids/#{current_grid}/nodes/#{node_id}")
+      data = { labels: Array(node['labels']).reject {|label| label_list.include?(label) } }
       client.put("nodes/#{node['id']}", data, {}, {'Kontena-Grid-Token' => node['grid']['token']})
     end
   end

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

@@ -15,6 +15,7 @@ module Kontena::Cli::Nodes
       puts "#{node['name']}:"
       puts "  id: #{node['id']}"
       puts "  agent version: #{node['agent_version']}"
+      puts "  docker version: #{node['docker_version']}"
       puts "  connected: #{node['connected'] ? 'yes': 'no'}"
       puts "  last connect: #{node['updated_at']}"
       puts "  last seen: #{node['last_seen_at']}"

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

@@ -0,0 +1,8 @@
+module Kontena::Cli::Plugins
+  module Common
+
+    def short_name(name)
+      name.sub('kontena-plugin-', '')
+    end
+  end
+end

data/lib/kontena/cli/plugins/install_command.rb

@@ -16,13 +16,13 @@ module Kontena::Cli::Plugins
 
     def install_plugin(name)
       plugin = "kontena-plugin-#{name}"
-      gem_bin = which('gem')
+      uninstall_previous(plugin) if plugin_exists?(plugin)
       install_options = ['--no-ri', '--no-doc']
       install_options << "--version #{version}" if version
       install_options << "--pre" if pre?
       install_command = "#{gem_bin} install #{install_options.join(' ')} #{plugin}"
       success = false
-      spinner "installing plugin #{name.colorize(:cyan)}" do
+      spinner "Installing plugin #{name.colorize(:cyan)}" do
         stdout, stderr, status = Open3.capture3(install_command)
         unless stderr.empty?
           raise stderr
@@ -31,5 +31,24 @@ module Kontena::Cli::Plugins
     rescue => exc
       puts exc.message
     end
+
+    def plugin_exists?(name)
+      Kontena::PluginManager.instance.plugins.any? { |p| p.name == name}
+    end
+
+    def gem_bin
+      @gem_bin ||= which('gem')
+    end
+
+    def uninstall_previous(name)
+      uninstall_command = "#{gem_bin} uninstall -q #{name}"
+      success = false
+      spinner "Uninstalling previous version of plugin" do
+        stdout, stderr, status = Open3.capture3(uninstall_command)
+        unless stderr.empty?
+          raise stderr
+        end
+      end
+    end
   end
 end

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

@@ -1,13 +1,15 @@
+require_relative 'common'
+
 module Kontena::Cli::Plugins
   class ListCommand < Kontena::Command
+    include Common
 
     def execute
       titles = ['NAME', 'VERSION', 'DESCRIPTION']
       puts "%-40s %-10s %-40s" % titles
       Kontena::PluginManager.instance.plugins.each do |plugin|
-        puts "%-40s %-10s %-40s" % [plugin.name, plugin.version, plugin.description]
+        puts "%-40s %-10s %-40s" % [short_name(plugin.name), plugin.version, plugin.description]
       end
     end
-
   end
 end

data/lib/kontena/cli/plugins/search_command.rb

@@ -1,5 +1,8 @@
+require_relative 'common'
+
 module Kontena::Cli::Plugins
   class SearchCommand < Kontena::Command
+    include Common
 
     parameter '[NAME]', 'Search text'
 
@@ -8,8 +11,7 @@ module Kontena::Cli::Plugins
       exit_with_error("Cannot access plugin server") unless results
       puts "%-50s %-10s %-60s" % ['NAME', 'VERSION', 'DESCRIPTION']
       results.each do |item|
-        name = item['name'].sub('kontena-plugin-', '')
-        puts "%-50s %-10s %-60s" % [name, item['version'], item['info']]
+        puts "%-50s %-10s %-60s" % [short_name(item['name']), item['version'], item['info']]
       end
     end
 

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

@@ -86,19 +86,26 @@ module Kontena::Cli::Registry
       env << "REGISTRY_HTTP_SECRET=#{SecureRandom.hex(24)}"
 
       data = {
-          name: 'registry',
-          stateful: stateful,
-          container_count: instances,
-          image: "kontena/registry:#{REGISTRY_VERSION}",
-          volumes: ['/registry'],
-          env: env,
-          secrets: secrets,
-          affinity: affinity
+        name: 'registry',
+        services: [
+          {
+            name: 'api',
+            stateful: stateful,
+            container_count: instances,
+            image: "kontena/registry:#{REGISTRY_VERSION}",
+            volumes: ['/registry'],
+            env: env,
+            secrets: secrets,
+            affinity: affinity
+          }
+        ]
       }
-      client(token).post("grids/#{current_grid}/services", data)
-      client(token).post("services/#{current_grid}/registry/deploy", {})
-      spinner "deploying #{data[:name].colorize(:cyan)} service " do
-        wait_for_deploy_to_finish(token, parse_service_id(data[:name]))
+
+      client(token).post("grids/#{current_grid}/stacks", data)
+      client(token).post("stacks/#{current_grid}/registry/deploy", {})
+      spinner "Deploying #{data[:name].colorize(:cyan)} stack " do
+        sleep 1 until client(token).get("stacks/#{current_grid}/registry")['state'] == 'deploying'
+        sleep 1 until client(token).get("stacks/#{current_grid}/registry")['state'] == 'running'
       end
       puts "\n"
       puts "Docker Registry #{REGISTRY_VERSION} is now running at registry.#{current_grid}.kontena.local."

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

@@ -10,11 +10,11 @@ module Kontena::Cli::Registry
       confirm unless forced?
       name = 'registry'
 
-      registry = client(token).get("services/#{current_grid}/#{name}") rescue nil
-      exit_with_error("Service #{name.colorize(:cyan)} does not exist") if registry.nil?
+      registry = client(token).get("stacks/#{current_grid}/#{name}") rescue nil
+      exit_with_error("Stack #{name.colorize(:cyan)} does not exist") if registry.nil?
 
-      spinner "Removing #{name.colorize(:cyan)} service " do
-        client(token).delete("services/#{current_grid}/#{name}")
+      spinner "Removing #{name.colorize(:cyan)} stack " do
+        client(token).delete("stacks/#{current_grid}/#{name}")
       end
     end
   end

data/lib/kontena/cli/registry_command.rb

@@ -1,5 +1,4 @@
 require_relative 'registry/create_command'
-require_relative 'registry/delete_command'
 require_relative 'registry/remove_command'
 
 class Kontena::Cli::RegistryCommand < Kontena::Command

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

@@ -35,12 +35,12 @@ module Kontena::Cli::Services
     option "--deploy-interval", "TIME", "Auto-deploy with given interval (format: <number><unit>, where unit = min, h, d)"
     option "--pid", "PID", "Pid namespace to use"
     option "--secret", "SECRET", "Import secret from Vault (format: <secret>:<name>:<env>)", multivalued: true
-    option "--health-check-uri", "HEALTH CHECK URI", "URI path for HTTP health check"
-    option "--health-check-timeout", "HEALTH CHECK TIMEOUT", "Timeout for health check"
-    option "--health-check-interval", "HEALTH CHECK INTERVAL", "Interval for health check"
-    option "--health-check-initial-delay", "HEALTH CHECK INITIAL DELAY", "Initial delay for health check"
-    option "--health-check-port", "HEALTH CHECK PORT", "Port for health check"
-    option "--health-check-protocol", "HEALTH CHECK PROTOCOL", "Protocol of health check"
+    option "--health-check-uri", "URI", "URI path for HTTP health check"
+    option "--health-check-timeout", "TIMEOUT", "Timeout for health check"
+    option "--health-check-interval", "INTERVAL", "Interval for health check"
+    option "--health-check-initial-delay", "DELAY", "Initial delay for health check"
+    option "--health-check-port", "PORT", "Port for health check"
+    option "--health-check-protocol", "PROTOCOL", "Protocol of health check"
 
     def execute
       require_api_url

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

@@ -7,17 +7,21 @@ module Kontena::Cli::Services
     include ServicesHelper
 
     parameter "NAME", "Service name"
-    option '--force-deploy', :flag, 'Force deploy even if service does not have any changes'
+    option '--force', :flag, 'Force deploy even if service does not have any changes'
+    option '--force-deploy', :flag, '[DEPRECATED: use --force]'
 
     def execute
       require_api_url
       token = require_token
       service_id = name
       data = {}
-      data[:force] = true if force_deploy?
+      data[:force] = true if force? || force_deploy? # deprecated
+      if force_deploy?
+        warning "--force-deploy will deprecate in the future, use --force"
+      end
       spinner "Deploying service #{name.colorize(:cyan)} " do
-        deploy_service(token, name, data)
-        wait_for_deploy_to_finish(token, parse_service_id(name))
+        deployment = deploy_service(token, name, data)
+        wait_for_deploy_to_finish(token, deployment)
       end
     end
   end

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

@@ -6,33 +6,46 @@ module Kontena::Cli::Services
     include Kontena::Cli::GridOptions
     include ServicesHelper
 
+    option ["-q", "--quiet"], :flag, "Show only service names"
+    option '--stack', 'STACK', 'Stack name'
+
     def execute
       require_api_url
       token = require_token
 
-      grids = client(token).get("grids/#{current_grid}/services")
+      grids = client(token).get("grids/#{current_grid}/services?stack=#{stack}")
       services = grids['services'].sort_by{|s| s['updated_at'] }.reverse
-      titles = ['NAME', 'INSTANCES', 'STATEFUL', 'STATE', 'EXPOSED PORTS']
-      puts "%-60s %-10s %-8s %-10s %-50s" % titles
-      services.each do |service|
-        stateful = service['stateful'] ? 'yes' : 'no'
-        running = service['instances']['running']
-        desired = service['container_count']
-        instances = "#{running} / #{desired}"
-        ports = service['ports'].map{|p|
-          "#{p['ip']}:#{p['node_port']}->#{p['container_port']}/#{p['protocol']}"
-        }.join(", ")
-        health = health_status(service)
-        vars = [
-          health_status_icon(health),
-          "#{service['name']}",
-          instances,
-          stateful,
-          service['state'],
-          ports
-        ]
-        puts "%s %-58s %-10.10s %-8s %-10s %-50s" % vars
+      if quiet?
+        services.each do |service|
+          puts "#{service.dig('stack', 'id')}/#{service['name']}"
+        end
+      else
+        titles = ['NAME', 'INSTANCES', 'STATEFUL', 'STATE', 'EXPOSED PORTS']
+        puts "%-60s %-10s %-8s %-10s %-50s" % titles
+        services.each do |service|
+          print_service_row(service)
+        end
       end
     end
+
+    def print_service_row(service)
+      stateful = service['stateful'] ? 'yes' : 'no'
+      running = service['instances']['running']
+      desired = service['container_count']
+      instances = "#{running} / #{desired}"
+      ports = service['ports'].map{|p|
+        "#{p['ip']}:#{p['node_port']}->#{p['container_port']}/#{p['protocol']}"
+      }.join(", ")
+      health = health_status(service)
+      vars = [
+        health_status_icon(health),
+        "#{service.dig('stack', 'name')}/#{service['name']}",
+        instances,
+        stateful,
+        service['state'],
+        ports
+      ]
+      puts "%s %-58s %-10.10s %-8s %-10s %-50s" % vars
+    end
   end
 end

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

@@ -10,7 +10,7 @@ module Kontena::Cli::Services
 
     parameter "NAME", "Service name"
     option ["-i", "--instance"], "INSTANCE", "Show only given instance specific logs"
-    
+
     def execute
       require_api_url
 

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

@@ -11,9 +11,9 @@ module Kontena::Cli::Services
 
     def execute
       token = require_token
-      spinner "Scaling #{name} " do
-        scale_service(token, name, instances)
-        wait_for_deploy_to_finish(token, parse_service_id(name))
+      spinner "Scaling #{pastel.cyan(name)} to #{instances} instances " do
+        deployment = scale_service(token, name, instances)
+        wait_for_deploy_to_finish(token, deployment)
       end
     end
   end

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

@@ -43,6 +43,7 @@ module Kontena
           service = get_service(token, service_id)
           grid = service['id'].split('/')[0]
           puts "#{service['id']}:"
+          puts "  stack: #{service['stack']['id'] }"
           puts "  status: #{service['state'] }"
           puts "  image: #{service['image']}"
           puts "  revision: #{service['revision']}"
@@ -57,7 +58,7 @@ module Kontena
           if service['deploy_opts']['interval']
             puts "    interval: #{service['deploy_opts']['interval']}"
           end
-          puts "  dns: #{service['name']}.#{grid}.kontena.local"
+          puts "  dns: #{service['dns']}"
 
           if service['affinity'].to_a.size > 0
             puts "  affinity: "
@@ -181,7 +182,9 @@ module Kontena
             puts "    healthy: #{service['health_status']['healthy']}"
             puts "    total: #{service['health_status']['total']}"
           end
+        end
 
+        def show_service_instances(token, service_id)
           puts "  instances:"
           result = client(token).get("services/#{parse_service_id(service_id)}/containers")
           result['containers'].each do |container|
@@ -189,8 +192,8 @@ module Kontena
             puts "      rev: #{container['deploy_rev']}"
             puts "      service_rev: #{container['service_rev']}"
             puts "      node: #{container['node']['name'] rescue 'unknown'}"
-            puts "      dns: #{container['name']}.#{grid}.kontena.local"
-            puts "      ip: #{container['overlay_cidr'].to_s.split('/')[0]}"
+            puts "      dns: #{container['hostname']}.#{container['domainname']}"
+            puts "      ip: #{container['ip_address']}"
             puts "      public ip: #{container['node']['public_ip'] rescue 'unknown'}"
             if container['health_status']
               health_time = Time.now - Time.parse(container.dig('health_status', 'updated_at'))
@@ -219,21 +222,19 @@ module Kontena
         end
 
         # @param [String] token
-        # @param [String] name
+        # @param [Hash] deployment
         # @return [Boolean]
-        def wait_for_deploy_to_finish(token, name, timeout = 600)
-          service = client(token).get("services/#{name}")
-          desired_count = service['container_count']
-          updated_at = DateTime.parse(service['updated_at']) rescue DateTime.now
+        def wait_for_deploy_to_finish(token, deployment, timeout = 600)
           deployed = false
           Timeout::timeout(timeout) do
             until deployed
-              containers = client(token).get("services/#{name}/containers")['containers']
-              deployed = containers.size == desired_count && containers.all?{ |c|
-                DateTime.parse(c['created_at']) >= updated_at rescue false
-              }
+              deployment = client(token).get("services/#{deployment['service_id']}/deploys/#{deployment['id']}")
+              deployed = true if deployment['finished_at']
               sleep 1
             end
+            if deployment['state'] == 'error'
+              raise Kontena::Errors::StandardError.new(500, deployment['reason'])
+            end
           end
 
           deployed
@@ -272,10 +273,13 @@ module Kontena
         # @param [String] service_id
         # @return [String]
         def parse_service_id(service_id)
-          if service_id.to_s.include?('/')
+          count = service_id.to_s.count('/')
+          if count == 2
             param = service_id
-          else
+          elsif count == 1
             param = "#{current_grid}/#{service_id}"
+          else
+            param = "#{current_grid}/default/#{service_id}"
           end
         end