kontena-cli 1.1.0.rc1 → 1.1.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e7c1e0f1f4b7150cbb38ae75bd31b5d9c011018
-  data.tar.gz: 105cd534097a4479c050b0ca174014c61b327677
+  metadata.gz: f7edb62c595acf6b8f5aaea89084034682684ff6
+  data.tar.gz: c90522985a940d60902b7f817b5e1c1e9c26ebec
 SHA512:
-  metadata.gz: c8fb7ead66ba6c861d79544f3955b13eadf8e3ceab55fbf3f3a1c108f7bcf23730ee97fccec1cf74b5d2ea8239af9eeb5ac6453b5892eb4b60ddbeda4392d9de
-  data.tar.gz: 27978ab4aea44afadff0f59119b993771e36ef3fc4a8688e15d88d3a3cf54525600d70b4d8b5c566790063f8b5a603a25d1a782c0eac8ea81c70805faf2299b1
+  metadata.gz: f213b43e9dc53072014b7ded6f3700a4ff3158f1865c7c7c73aa63fd123af5372f8c7c9bf120dde7ae481104b43eef59e8e991e22cb76edc2472b9e1086e9146
+  data.tar.gz: 2d2d45f3431164ab8a56ce97b77d5296f6e03788c2e2f9dc0cefbecf2b2672219f377a09c7078a7512e1fead10dff3f721970ca32e4ed764571013d5bbde11b1

data/VERSION

@@ -1 +1 @@
-1.1.0.rc1
+1.1.0.rc2

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

@@ -14,7 +14,6 @@ module Kontena::Cli::Apps
     option ['-p', '--project-name'], 'NAME', 'Specify an alternate project name (default: directory name)'
     option '--async', :flag, 'Run deploys async/parallel'
     option '--force', :flag, 'Force deploy even if service does not have any changes'
-    option '--force-deploy', :flag, '[DEPRECATED: use --force]'
 
     option '--skip-validation', :flag, 'Skip YAML file validation', default: false
     parameter "[SERVICE] ...", "Services to start"
@@ -46,10 +45,7 @@ module Kontena::Cli::Apps
       queue.each do |service|
         name = service['id'].split('/').last
         options = {}
-        options[:force] = true if force? || force_deploy? # deprecated
-        if force_deploy?
-          warning " --force-deploy will deprecate in the future, use --force"
-        end
+        options[:force] = true if force?
         spinner "Deploying #{unprefixed_name(name).colorize(:cyan)} " do
           deployment = deploy_service(token, name, options)
           unless async?

data/lib/kontena/cli/cloud/login_command.rb

@@ -51,6 +51,14 @@ module Kontena::Cli::Cloud
     end
 
     def web_flow
+      if Kontena.browserless? && !force?
+        STDERR.puts "Your current environment does not seem to support opening a local graphical WWW browser."
+        STDERR.puts
+        STDERR.puts "You can perorm a login on another computer, copy the token and use it with 'kontena cloud login --token <token>'."
+        STDERR.puts "There will be an easier way to log in from a browserless environment soon."
+        exit_with_error 'Unable to launch a web browser'
+      end
+
       require_relative '../localhost_web_server'
       require 'launchy'
 
@@ -85,7 +93,7 @@ module Kontena::Cli::Cloud
 
       server_thread  = Thread.new { Thread.main['response'] = web_server.serve_one }
       browser_thread = Thread.new { Launchy.open(uri.to_s) }
-      
+
       spinner "Waiting for browser authorization response" do
         server_thread.join
       end

data/lib/kontena/cli/common.rb

@@ -92,12 +92,12 @@ module Kontena
 
       def warning(msg)
         warning = pastel.yellow('warn')
-        STDERR.puts " [#{warning}] #{msg}"
+        $stderr.puts " [#{warning}] #{msg}"
       end
 
       def exit_with_error(msg, code = 1)
         error = pastel.red('error')
-        STDERR.puts " [#{error}] #{msg}"
+        $stderr.puts " [#{error}] #{msg}"
         exit code
       end
 

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

@@ -0,0 +1,58 @@
+require_relative 'common'
+
+module Kontena::Cli::Etcd
+  class HealthCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+    include Kontena::Cli::Helpers::HealthHelper
+
+    parameter "[NODE]", "Show health for specific node"
+
+    requires_current_master
+    requires_current_grid
+
+    def execute
+      require_api_url
+      token = require_token
+
+      health = true
+
+      if self.node
+        node_health = client.get("nodes/#{current_grid}/#{self.node}/health")
+
+        health = show_node_health(node_health)
+      else
+        nodes = client.get("grids/#{current_grid}/nodes")['nodes']
+
+        nodes.each do |node|
+          node_health = client.get("nodes/#{current_grid}/#{node['name']}/health")
+
+          if !show_node_health(node_health)
+            health = false
+          end
+        end
+      end
+
+      return health
+    end
+
+    # @return [Boolean]
+    def show_node_health(node_health)
+      etcd_health = node_health['etcd_health']
+
+      if !node_health['connected']
+        puts "#{health_icon :offline} Node #{node_health['name']} is offline"
+        return false
+      elsif etcd_health['health']
+        puts "#{health_icon :ok} Node #{node_health['name']} is healthy"
+        return true
+      elsif etcd_health['error']
+        puts "#{health_icon :error} Node #{node_health['name']} is unhealthy: #{etcd_health['error']}"
+        return false
+      else
+        puts "#{health_icon :error} Node #{node_health['name']} is unhealthy"
+        return false
+      end
+    end
+  end
+end

data/lib/kontena/cli/etcd_command.rb

@@ -3,6 +3,7 @@ require_relative 'etcd/set_command'
 require_relative 'etcd/mkdir_command'
 require_relative 'etcd/list_command'
 require_relative 'etcd/remove_command'
+require_relative 'etcd/health_command'
 
 class Kontena::Cli::EtcdCommand < Kontena::Command
 
@@ -11,6 +12,7 @@ class Kontena::Cli::EtcdCommand < Kontena::Command
   subcommand ["mkdir", "mk"], "Create a directory", Kontena::Cli::Etcd::MkdirCommand
   subcommand ["list", "ls"], "List a directory", Kontena::Cli::Etcd::ListCommand
   subcommand "rm", "Remove a key or a directory", Kontena::Cli::Etcd::RemoveCommand
+  subcommand "health", "Check etcd health", Kontena::Cli::Etcd::HealthCommand
 
   def execute
   end

data/lib/kontena/cli/external_registry_command.rb

@@ -1,6 +1,5 @@
 require_relative 'external_registries/add_command'
 require_relative 'external_registries/list_command'
-require_relative 'external_registries/delete_command'
 require_relative 'external_registries/remove_command'
 
 class Kontena::Cli::ExternalRegistryCommand < Kontena::Command
@@ -8,7 +7,6 @@ class Kontena::Cli::ExternalRegistryCommand < Kontena::Command
   subcommand "add", "Add external Docker image registry", Kontena::Cli::ExternalRegistries::AddCommand
   subcommand ["list", "ls"], "List external Docker image registries", Kontena::Cli::ExternalRegistries::ListCommand
   subcommand ["remove", "rm"], "Remove external Docker image registry", Kontena::Cli::ExternalRegistries::RemoveCommand
-  subcommand "delete", "[DEPRECATED] Delete external Docker image registry", Kontena::Cli::ExternalRegistries::DeleteCommand
 
   def execute
   end

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

@@ -9,7 +9,7 @@ module Kontena::Cli::Master
     option ['-t', '--token'], '[TOKEN]', 'Use a pre-generated access token', environment_variable: 'KONTENA_TOKEN'
     option ['-n', '--name'], '[NAME]', 'Set server name', environment_variable: 'KONTENA_MASTER'
     option ['-c', '--code'], '[CODE]', 'Use authorization code generated during master install'
-    option ['-r', '--remote'], :flag, 'Do not try to open a browser'
+    option ['-r', '--[no-]remote'], :flag, 'Login using a browser on another device', default: Kontena.browserless?
     option ['-e', '--expires-in'], '[SECONDS]', 'Request token with expiration of X seconds. Use 0 to never expire', default: 7200
     option ['-v', '--verbose'], :flag, 'Increase output verbosity'
     option ['-f', '--force'], :flag, 'Force reauthentication'
@@ -69,13 +69,14 @@ module Kontena::Cli::Master
       if self.remote?
         # no local browser? tell user to launch an external one
         display_remote_message(server, auth_params)
-        update_server_to_config(server)
-        exit 1
+        auth_code = prompt.ask("Enter code displayed in browser:")
+        use_authorization_code(server, auth_code)
       else
         # local web flow
         web_flow(server, auth_params)
-        display_login_info(only: :master) unless (running_silent? || self.no_login_info?)
       end
+
+      display_login_info(only: :master) unless (running_silent? || self.no_login_info?)
     end
 
     def next_default_name
@@ -170,9 +171,6 @@ module Kontena::Cli::Master
       else
         puts "Visit this URL in a browser:"
         puts "#{url}"
-        puts
-        puts "Then complete the authentication by using:"
-        puts "kontena master login --code <CODE FROM BROWSER> #{server.url}"
       end
     end
 

data/lib/kontena/cli/service_command.rb

@@ -7,7 +7,6 @@ require_relative 'services/start_command'
 require_relative 'services/restart_command'
 require_relative 'services/create_command'
 require_relative 'services/scale_command'
-require_relative 'services/delete_command'
 require_relative 'services/remove_command'
 require_relative 'services/containers_command'
 require_relative 'services/logs_command'
@@ -19,6 +18,7 @@ require_relative 'services/secret_command'
 
 require_relative 'services/link_command'
 require_relative 'services/unlink_command'
+require_relative 'services/exec_command'
 
 class Kontena::Cli::ServiceCommand < Kontena::Command
 
@@ -32,7 +32,6 @@ class Kontena::Cli::ServiceCommand < Kontena::Command
   subcommand "restart", "Restart service", Kontena::Cli::Services::RestartCommand
   subcommand "scale", "Scale service", Kontena::Cli::Services::ScaleCommand
   subcommand ["remove", "rm"], "Remove service", Kontena::Cli::Services::RemoveCommand
-  subcommand "delete", "[DEPRECATED] Delete service", Kontena::Cli::Services::DeleteCommand
   subcommand "containers", "List service containers", Kontena::Cli::Services::ContainersCommand
   subcommand "logs", "Show service logs", Kontena::Cli::Services::LogsCommand
   subcommand "stats", "Show service statistics", Kontena::Cli::Services::StatsCommand
@@ -44,6 +43,7 @@ class Kontena::Cli::ServiceCommand < Kontena::Command
 
   subcommand "link", "Link service to another service", Kontena::Cli::Services::LinkCommand
   subcommand "unlink", "Unlink service from another service", Kontena::Cli::Services::UnlinkCommand
+  subcommand "exec", "Execute commands in service containers", Kontena::Cli::Services::ExecCommand
 
   def execute
   end

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

@@ -8,17 +8,13 @@ module Kontena::Cli::Services
 
     parameter "NAME", "Service name"
     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? || force_deploy? # deprecated
-      if force_deploy?
-        warning "--force-deploy will deprecate in the future, use --force"
-      end
+      data[:force] = true if force?
       spinner "Deploying service #{name.colorize(:cyan)} " do
         deployment = deploy_service(token, name, data)
         wait_for_deploy_to_finish(token, deployment)

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

@@ -0,0 +1,84 @@
+require_relative 'services_helper'
+
+module Kontena::Cli::Services
+  class ExecCommand < Kontena::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+    include ServicesHelper
+
+    parameter "NAME", "Service name"
+    parameter "CMD ...", "Command"
+
+    option ["-i", "--instance"], "INSTANCE", "Exec on given numbered instance, default first running" do |value| Integer(value) end
+    option ["-a", "--all"], :flag, "Exec on all running instances"
+    option ["--shell"], :flag, "Execute as a shell command"
+    option ["--skip"], :flag, "Skip failed instances when executing --all"
+    option ["--silent"], :flag, "Do not show exec status"
+    option ["--verbose"], :flag, "Show exec status"
+
+    requires_current_master
+    requires_current_grid
+
+    # Exits if exec returns with non-zero
+    def exec_container(container)
+      if shell?
+        cmd = ['sh', '-c', cmd_list.join(' ')]
+      else
+        cmd = cmd_list
+      end
+
+      stdout = stderr = exit_status = nil
+
+      if !silent? && (verbose? || all?)
+        spinner "Executing command on #{container['name']}" do
+          stdout, stderr, exit_status = client.post("containers/#{container['id']}/exec", {cmd: cmd})
+
+          raise Kontena::Cli::SpinAbort if exit_status != 0
+        end
+      else
+        stdout, stderr, exit_status = client.post("containers/#{container['id']}/exec", {cmd: cmd})
+      end
+
+      stdout.each do |chunk| $stdout.write chunk end
+      stderr.each do |chunk| $stderr.write chunk end
+
+      exit exit_status if exit_status != 0 && !skip?
+
+      return exit_status == 0
+    end
+
+    def execute
+      service_containers = client.get("services/#{parse_service_id(name)}/containers")['containers']
+      service_containers.sort_by! { |container| container['instance_number'] }
+      running_containers = service_containers.select{|container| container['status'] == 'running' }
+
+      if running_containers.empty?
+        exit_with_error "Service #{name} does not have any running containers"
+      end
+
+      if all?
+        ret = true
+        service_containers.each do |container|
+          if container['status'] == 'running'
+            if !exec_container(container)
+              ret = false
+            end
+          else
+            warning "Service #{name} container #{container['name']} is #{container['status']}, skipping"
+          end
+        end
+        return ret
+      elsif instance
+        if !(container = service_containers.find{|container| container['instance_number'] == instance})
+          exit_with_error "Service #{name} does not have container instance #{instance}"
+        elsif container['status'] != 'running'
+          exit_with_error "Service #{name} container #{container['name']} is not running, it is #{container['status']}"
+        else
+          exec_container(container)
+        end
+      else
+        exec_container(running_containers.first)
+      end
+    end
+  end
+end

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

@@ -43,10 +43,13 @@ module Kontena
           service = get_service(token, service_id)
           grid = service['id'].split('/')[0]
           puts "#{service['id']}:"
+          puts "  created: #{service['created_at']}"
+          puts "  updated: #{service['updated_at']}"
           puts "  stack: #{service['stack']['id'] }"
-          puts "  status: #{service['state'] }"
+          puts "  state: #{service['state'] }"
           puts "  image: #{service['image']}"
           puts "  revision: #{service['revision']}"
+          puts "  stack_revision: #{service['stack_revision']}" if service['stack_revision']
           puts "  stateful: #{service['stateful'] == true ? 'yes' : 'no' }"
           puts "  scaling: #{service['instances'] }"
           puts "  strategy: #{service['strategy']}"

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

@@ -21,18 +21,8 @@ module Kontena::Cli::Stacks
     end
 
     module StackFileOrNameParam
-      attr_accessor :from_registry
-
       def self.included(where)
-        where.parameter "[FILE]", "Kontena stack file or a registry stack name (user/stack or user/stack:version)", default: "kontena.yml", attribute_name: :filename do |filename|
-          if !File.exist?(filename) && filename =~ /\A[a-zA-Z0-9\_\.\-]+\/[a-zA-Z0-9\_\.\-]+(?::.*)?\z/
-            @from_registry = true
-          else
-            @from_registry = false
-            require_config_file(filename)
-          end
-          filename
-        end
+        where.parameter "[FILE]", "Kontena stack file, registry stack name (user/stack or user/stack:version) or URL", default: "kontena.yml", attribute_name: :filename
       end
     end
 
@@ -59,8 +49,8 @@ module Kontena::Cli::Stacks
       @stack_name ||= self.name || stack_name_from_yaml(filename)
     end
 
-    def reader_from_yaml(filename, from_registry: false, name: nil, values: nil)
-      reader = Kontena::Cli::Stacks::YAML::Reader.new(filename, from_registry: from_registry, values: values)
+    def reader_from_yaml(filename, name: nil, values: nil, defaults: nil)
+      reader = Kontena::Cli::Stacks::YAML::Reader.new(filename, values: values, defaults: defaults)
       if reader.stack_name.nil?
         exit_with_error "Stack MUST have stack name in YAML top level field 'stack'! Aborting."
       end
@@ -68,8 +58,8 @@ module Kontena::Cli::Stacks
       reader
     end
 
-    def stack_from_yaml(filename, from_registry: false, name: nil, values: nil)
-      reader = reader_from_yaml(filename, from_registry: from_registry, name: name, values: values)
+    def stack_from_yaml(filename, name: nil, values: nil, defaults: nil)
+      reader = reader_from_yaml(filename, name: name, values: values, defaults: defaults)
       outcome = reader.execute
 
       hint_on_validation_notifications(outcome[:notifications]) if outcome[:notifications].size > 0
@@ -83,8 +73,7 @@ module Kontena::Cli::Stacks
         'source' => reader.raw_content,
         'registry' => 'file://',
         'services' => kontena_services,
-        'variables' => outcome[:variables],
-        'vault_keys' => outcome[:vault_keys]
+        'variables' => outcome[:variables]
       }
       stack
     end

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

@@ -11,7 +11,7 @@ module Kontena::Cli::Stacks
     include Common::StackFileOrNameParam
 
     include Common::StackNameOption
-    option '--deploy', :flag, 'Deploy after installation'
+    option '--[no-]deploy', :flag, 'Trigger deploy after installation', default: true
 
     include Common::StackValuesFromOption
 
@@ -20,15 +20,7 @@ module Kontena::Cli::Stacks
     requires_current_master_token
 
     def execute
-
-      if !File.exist?(filename) && filename =~ /\A[a-zA-Z0-9\_\.\-]+\/[a-zA-Z0-9\_\.\-]+(?::.*)?\z/
-        from_registry = true
-      else
-        from_registry = false
-        require_config_file(filename)
-      end
-
-      stack = stack_from_yaml(filename, from_registry: from_registry, name: name, values: values)
+      stack = stack_from_yaml(filename, name: name, values: values)
 
       stack['name'] = name if name
       spinner "Creating stack #{pastel.cyan(stack['name'])} " do

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

@@ -25,11 +25,12 @@ module Kontena::Cli::Stacks
       stack = fetch_stack(name)
 
       puts "#{stack['name']}:"
+      puts "  created: #{stack['created_at']}"
+      puts "  updated: #{stack['updated_at']}"
       puts "  state: #{stack['state']}"
       puts "  stack: #{stack['stack']}"
       puts "  version: #{stack['version']}"
-      puts "  created_at: #{stack['created_at']}"
-      puts "  updated_at: #{stack['updated_at']}"
+      puts "  revision: #{stack['revision']}"
       puts "  expose: #{stack['expose'] || '-'}"
       puts "  services:"
       stack['services'].each do |service|
@@ -43,14 +44,16 @@ module Kontena::Cli::Stacks
       service = get_service(token, service_id)
       pad = '    '.freeze
       puts "#{pad}#{service['name']}:"
+      puts "#{pad}  created: #{service['created_at']}"
+      puts "#{pad}  updated: #{service['updated_at']}"
       puts "#{pad}  image: #{service['image']}"
-      puts "#{pad}  status: #{service['state'] }"
+      puts "#{pad}  revision: #{service['stack_revision']}"
+      puts "#{pad}  state: #{service['state'] }"
       if service['health_status']
         puts "#{pad}  health_status:"
         puts "#{pad}    healthy: #{service['health_status']['healthy']}"
         puts "#{pad}    total: #{service['health_status']['total']}"
       end
-      puts "#{pad}  revision: #{service['revision']}"
       puts "#{pad}  stateful: #{service['stateful'] == true ? 'yes' : 'no' }"
       puts "#{pad}  scaling: #{service['instances'] }"
       puts "#{pad}  strategy: #{service['strategy']}"
@@ -71,6 +74,15 @@ module Kontena::Cli::Stacks
         end
       end
 
+      if service['secrets'].to_a.size > 0
+        puts "#{pad}  secrets: "
+        service['secrets'].to_a.each do |s|
+          puts "#{pad}    - secret: #{s['secret']}"
+          puts "#{pad}      name: #{s['name']}"
+          puts "#{pad}      type: #{s['type']}"
+        end
+      end
+
       unless service['cmd'].to_s.empty?
         if service['cmd']
           puts "#{pad}  cmd: #{service['cmd'].join(' ')}"
@@ -86,6 +98,20 @@ module Kontena::Cli::Stacks
         end
       end
 
+      if service['volumes'].to_a.size > 0
+        puts "#{pad}  volumes:"
+        service['volumes'].to_a.each do |v|
+          puts "#{pad}    - #{v}"
+        end
+      end
+
+      if service['volumes_from'].to_a.size > 0
+        puts "#{pad}  volumes_from:"
+        service['volumes_from'].to_a.each do |v|
+          puts "#{pad}    - #{v}"
+        end
+      end
+
       if service['links'].to_a.size > 0
         puts "#{pad}  links: "
         service['links'].to_a.each do |l|