kontena-cli 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd8dd1a2fac72b1e4ff7a2673d263d519bc757b0
-  data.tar.gz: ad06dce5bdb05a6f050710fe90d861d6978cc271
+  metadata.gz: 95a8ffbdbff5aee91629d12bc4f3b39e01e242cf
+  data.tar.gz: 730864d95afd58a14b8d1e0477c292af652b34da
 SHA512:
-  metadata.gz: 69982d2741ba6644c9fc26e697937ffc1fca9e832ea5d8181ed40cfc3c5c79c05d68613035c8e1acdfe59b79089e04a3c51b9872cea1b3f80be9ad38a1e1ee14
-  data.tar.gz: c425be0997e31e8d84c2523ead66fbde8ba732d8155b3ea3147292051204df9182a65e6211aa80602f20c34f69333070a2a5940dd1ef274f671f890e73ebac82
+  metadata.gz: f0882dd73e058658b63f65066e31f188aced37c8b98bf07203a10ab92587f02dc6a1e6574c83f5b69f3b47542134b8aa7473d3ef814fa3cb5054ba7c39ec6809
+  data.tar.gz: 7f278890e746d3f59a2f1c262ba534ef118327a31dd75b8a22089c2aa4d566f45858428a588fab78ded50b9e25dce70cf3793357d687ff675b244c12ddbb793c

data/README.md

@@ -10,19 +10,21 @@ Install it yourself as:
 
     $ gem install kontena-cli
 
-## Usage
+To enable tab-completion for bash, add this to your `.bashrc` scripts:
 
-First you need to connect to a Kontena server:
+```
+which kontena > /dev/null && . "$( kontena whoami --bash-completion-path )"
+```
 
-    $ kontena connect
+## Usage
 
-To register a new user:
+First you need to register as a user:
 
     $ kontena register
 
-Then you can login with:
+Then you can login to master server:
 
-    $ kontena login
+    $ kontena login https://<master>:8080
 
 To get list of all commands:
 

data/lib/kontena/cli/commands.rb

@@ -17,4 +17,4 @@ require_relative 'containers/commands'
 require_relative 'grids/commands'
 require_relative 'nodes/commands'
 require_relative 'services/commands'
-require_relative 'stacks/commands'
+require_relative 'stacks/commands'

data/lib/kontena/cli/common.rb

@@ -50,7 +50,7 @@ module Kontena
       def api_url
         url = settings['server']['url']
         unless url
-          raise ArgumentError.new("Please init service first using: kontena connect")
+          raise ArgumentError.new("It seem's that you are not logged into Kontena master, please login with: kontena login")
         end
         url
       end

data/lib/kontena/cli/containers/containers.rb

@@ -10,7 +10,7 @@ module Kontena::Cli::Containers
       token = require_token
 
       payload = {cmd: ['sh', '-c', cmd]}
-      result = client(token).post("containers/#{container_id}/exec", payload)
+      result = client(token).post("containers/#{current_grid}/#{container_id}/exec", payload)
       puts result[0].join(" ") unless result[0].size == 0
       STDERR.puts result[1].join(" ") unless result[1].size == 0
       exit result[2]

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

@@ -4,7 +4,8 @@ require_relative 'grids'
 require_relative 'users'
 require_relative 'audit_log'
 require_relative 'vpn'
-
+require_relative 'registry'
+require_relative 'external_registries'
 
 command 'grid list' do |c|
   c.syntax = 'kontena grid list'
@@ -52,8 +53,9 @@ end
 command 'grid create' do |c|
   c.syntax = 'kontena grid create <name>'
   c.description = 'Create a new grid'
+  c.option '--initial-size INTEGER', Integer, 'Initial number of nodes'
   c.action do |args, options|
-    Kontena::Cli::Grids::Grids.new.create(args[0])
+    Kontena::Cli::Grids::Grids.new.create(args[0], options)
   end
 end
 
@@ -61,7 +63,7 @@ command 'grid remove' do |c|
   c.syntax = 'kontena grid remove <name>'
   c.description = 'Removes grid'
   c.action do |args, options|
-    Kontena::Cli::Platform::Grids.new.destroy(args[0])
+    Kontena::Cli::Grids::Grids.new.destroy(args[0])
   end
 end
 
@@ -115,3 +117,53 @@ command 'vpn config' do |c|
     Kontena::Cli::Grids::Vpn.new.config
   end
 end
+
+command 'registry create' do |c|
+  c.syntax = 'kontena registry create'
+  c.description = 'Create Docker Registry service'
+  c.option '--node STRING', String, 'Node name'
+  c.option '--s3-access-key STRING', String, 'S3 access key'
+  c.option '--s3-secret-key STRING', String, 'S3 secret key'
+  c.option '--s3-bucket STRING', String, 'S3 bucket'
+  c.option '--s3-region STRING', String, 'S3 region'
+  c.option '--s3-encrypt', 'S3 encrypt data'
+  c.option '--s3-secure', 'S3 use secure connection'
+  c.option '--azure-account-name STRING', String, 'Azure account name'
+  c.option '--azure-account-key STRING', String, 'Azure account key'
+  c.option '--azure-container-name STRING', String, 'Azure container name'
+  c.action do |args, options|
+    Kontena::Cli::Grids::Registry.new.create(options)
+  end
+end
+
+command 'registry delete' do |c|
+  c.syntax = 'kontena registry delete'
+  c.description = 'Delete Docker Registry service'
+  c.action do |args, options|
+    Kontena::Cli::Grids::Registry.new.delete
+  end
+end
+
+command 'external-registry add' do |c|
+  c.syntax = 'kontena external-registry add'
+  c.description = 'Add external private registry credentials'
+  c.action do |args, options|
+    Kontena::Cli::Grids::ExternalRegistries.new.add
+  end
+end
+
+command 'external-registry list' do |c|
+  c.syntax = 'kontena external-registry list'
+  c.description = 'List external private registries'
+  c.action do |args, options|
+    Kontena::Cli::Grids::ExternalRegistries.new.list
+  end
+end
+
+command 'external-registry delete' do |c|
+  c.syntax = 'kontena external-registry delete'
+  c.description = 'Delete external private registry'
+  c.action do |args, options|
+    Kontena::Cli::Grids::ExternalRegistries.new.destroy(args[0])
+  end
+end

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

@@ -0,0 +1,40 @@
+require 'kontena/client'
+require_relative '../common'
+
+module Kontena::Cli::Grids
+  class ExternalRegistries
+    include Kontena::Cli::Common
+
+    def add
+      default_url = 'https://index.docker.io/v1/'
+      require_api_url
+      require_current_grid
+      token = require_token
+
+      username = ask("Username: ")
+      password = password("Password: ")
+      email = ask("Email: ")
+      url = ask("URL [#{default_url}]: ")
+      url = default_url if url.strip == ''
+      data = { username: username, password: password, email: email, url: url }
+      client(token).post("grids/#{current_grid}/external_registries", data)
+    end
+
+    def destroy(name)
+      require_api_url
+      token = require_token
+      client(token).delete("external_registries/#{current_grid}/#{name}")
+    end
+
+    def list
+      require_api_url
+      require_current_grid
+      token = require_token
+      result = client(token).get("grids/#{current_grid}/external_registries")
+      puts "%-30s %-20s %-30s" % ['Name', 'Username', 'Email']
+      result['external_registries'].each { |r|
+        puts "%-30.30s %-20.20s %-30.30s" % [r['name'], r['username'], r['email']]
+      }
+    end
+  end
+end

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

@@ -12,14 +12,14 @@ module Kontena::Cli::Grids
         print color("You don't have any grids yet. Create first one with 'kontena grids create' command", :yellow)
       end
 
-      puts '%-30.30s %-10s %-10s %-10s' % ['Name', 'Nodes', 'Containers', 'Users']
+      puts '%-30.30s %-8s %-12s %-10s' % ['Name', 'Nodes', 'Services', 'Users']
       grids['grids'].each do |grid|
         if grid['id'] == current_grid
           name = "#{grid['name']} *"
         else
           name = grid['name']
         end
-        puts '%-30.30s %-10s %-10s %-10s' % [name, grid['nodeCount'], grid['containerCount'], grid['userCount']]
+        puts '%-30.30s %-8s %-12s %-10s' % [name, grid['node_count'], grid['service_count'], grid['user_count']]
       end
     end
 
@@ -29,7 +29,7 @@ module Kontena::Cli::Grids
       grid = find_grid_by_name(name)
       if !grid.nil?
         self.current_grid = grid
-        print color("Using #{grid['name']}", :green)
+        puts "Using grid: #{grid['name'].cyan}"
       else
         print color('Could not resolve grid by name. For a list of existing grids please run: kontena grid list', :red)
       end
@@ -41,41 +41,43 @@ module Kontena::Cli::Grids
 
       grid = find_grid_by_name(name)
       print_grid(grid)
-
     end
 
     def current
       require_api_url
       if current_grid.nil?
-        puts 'No grid selected. To select grid, please run: kontena use <grid name>'
-
+        puts 'No grid selected. To select grid, please run: kontena grid use <grid name>'
       else
         grid = client(require_token).get("grids/#{current_grid}")
         print_grid(grid)
       end
     end
 
-    def create(name=nil)
+    def create(name = nil, opts)
       require_api_url
 
       token = require_token
       payload = {
         name: name
       }
+      payload[:initial_size] = opts.initial_size if opts.initial_size
       grid = client(token).post('grids', payload)
-      puts "created #{grid['name']} (#{grid['id']})" if grid
+      if grid
+        self.current_grid = grid
+        puts "Using grid: #{grid['name'].cyan}"
+      end
     end
 
     def destroy(name)
       require_api_url
-
+      token = require_token
       grid = find_grid_by_name(name)
 
       if !grid.nil?
         response = client(token).delete("grids/#{grid['id']}")
         if response
           clear_current_grid if grid['id'] == current_grid
-          puts "removed #{grid['name']} (#{grid['id']})"
+          puts "removed #{grid['name'].cyan}"
         end
       else
         print color('Could not resolve grid by name. For a list of existing grids please run: kontena grid list', :red)
@@ -89,9 +91,10 @@ module Kontena::Cli::Grids
     def print_grid(grid)
       puts "#{grid['name']}:"
       puts "  token: #{grid['token']}"
-      puts "  users: #{grid['userCount']}"
-      puts "  nodes: #{grid['nodeCount']}"
-      puts "  containers: #{grid['containerCount']}"
+      puts "  users: #{grid['user_count']}"
+      puts "  nodes: #{grid['node_count']}"
+      puts "  services: #{grid['service_count']}"
+      puts "  containers: #{grid['container_count']}"
     end
 
     def grids

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

@@ -0,0 +1,90 @@
+require 'kontena/client'
+require_relative '../common'
+
+module Kontena::Cli::Grids
+  class Registry
+    include Kontena::Cli::Common
+
+    def create(opts)
+      require_api_url
+      token = require_token
+      preferred_node = opts.node
+
+      registry = client(token).get("services/#{current_grid}/registry") rescue nil
+      raise ArgumentError.new('Registry already exists') if registry
+
+      nodes = client(token).get("grids/#{current_grid}/nodes")
+      if preferred_node.nil?
+        node = nodes['nodes'].find{|n| n['connected']}
+        raise ArgumentError.new('Cannot find any online nodes') if node.nil?
+      else
+        node = nodes['nodes'].find{|n| n['connected'] && n['name'] == preferred_node }
+        raise ArgumentError.new('Node not found') if node.nil?
+      end
+
+      if opts.s3_access_key || opts.s3_secret_key
+        raise ArgumentError.new('--s3-access-key is missing') if opts.s3_access_key.nil?
+        raise ArgumentError.new('--s3-secret-key is missing') if opts.s3_secret_key.nil?
+        raise ArgumentError.new('--s3-bucket is missing') if opts.s3_bucket.nil?
+        s3_region = opts.s3_region || 'eu-west-1'
+        s3_encrypt = opts.s3_encrypt || false
+        s3_secure = opts.s3_secure || true
+        env = [
+          "REGISTRY_STORAGE=s3",
+          "REGISTRY_STORAGE_S3_ACCESSKEY=#{opts.s3_access_key}",
+          "REGISTRY_STORAGE_S3_SECRETKEY=#{opts.s3_secret_key}",
+          "REGISTRY_STORAGE_S3_REGION=#{s3_region}",
+          "REGISTRY_STORAGE_S3_BUCKET=#{opts.s3_bucket}",
+          "REGISTRY_STORAGE_S3_ENCRYPT=#{s3_encrypt}",
+          "REGISTRY_STORAGE_S3_SECURE=#{s3_secure}",
+        ]
+      elsif opts.azure_account_name || opts.azure_account_key
+        raise ArgumentError.new('--azure-account-name is missing') if opts.azure_account_name.nil?
+        raise ArgumentError.new('--azure-account-key is missing') if opts.azure_account_key.nil?
+        raise ArgumentError.new('--azure-container-name is missing') if opts.azure_container_name.nil?
+        env = [
+          "REGISTRY_STORAGE=azure",
+          "REGISTRY_STORAGE_AZURE_ACCOUNTNAME=#{opts.azure_account_name}",
+          "REGISTRY_STORAGE_AZURE_ACCOUNTKEY=#{opts.azure_account_key}",
+          "REGISTRY_STORAGE_AZURE_CONTAINERNAME=#{opts.azure_container_name}"
+        ]
+      else
+        env = [
+          "REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY=/registry"
+        ]
+      end
+
+      env << "REGISTRY_HTTP_ADDR=0.0.0.0:80"
+
+      data = {
+        name: 'registry',
+        stateful: true,
+        image: 'registry:2.0',
+        volumes: ['/registry'],
+        env: env,
+        affinity: ["node==#{node['name']}"]
+      }
+      client(token).post("grids/#{current_grid}/services", data)
+      result = client(token).post("services/#{current_grid}/registry/deploy", {})
+      print 'deploying registry service '
+      until client(token).get("services/#{current_grid}/registry")['state'] != 'deploying' do
+        print '.'
+        sleep 1
+      end
+      puts ' done'
+      puts "Docker Registry 2.0 is now running at registry.kontena.local."
+      puts "Note: OpenVPN connection is needed to establish connection to this registry."
+      puts 'Note 2: you must set "--insecure-registry 10.81.0.0/16" to your client docker daemon before you are able to push to this registry.'
+    end
+
+    def delete
+      require_api_url
+      token = require_token
+
+      registry = client(token).get("services/#{current_grid}/registry") rescue nil
+      raise ArgumentError.new("Docker Registry service does not exist") if registry.nil?
+
+      client(token).delete("services/#{current_grid}/registry")
+    end
+  end
+end

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

@@ -10,7 +10,7 @@ module Kontena::Cli::Grids
       token = require_token
       preferred_node = opts.node
 
-      vpn = client(token).get("services/vpn") rescue nil
+      vpn = client(token).get("services/#{current_grid}/vpn") rescue nil
       raise ArgumentError.new('Vpn already exists') if vpn
 
       nodes = client(token).get("grids/#{current_grid}/nodes")
@@ -40,9 +40,9 @@ module Kontena::Cli::Grids
         affinity: ["node==#{node['name']}"]
       }
       client(token).post("grids/#{current_grid}/services", data)
-      result = client(token).post("services/vpn/deploy", {})
+      result = client(token).post("services/#{current_grid}/vpn/deploy", {})
       print 'deploying '
-      until client(token).get("services/vpn")['state'] != 'deploying' do
+      until client(token).get("services/#{current_grid}/vpn")['state'] != 'deploying' do
         print '.'
         sleep 1
       end
@@ -55,16 +55,16 @@ module Kontena::Cli::Grids
       require_api_url
       token = require_token
 
-      vpn = client(token).get("services/vpn") rescue nil
+      vpn = client(token).get("services/#{current_grid}/vpn") rescue nil
       raise ArgumentError.new("VPN service does not exist") if vpn.nil?
 
-      client(token).delete("services/vpn")
+      client(token).delete("services/#{current_grid}/vpn")
     end
 
     def config
       require_api_url
       payload = {cmd: ['/usr/local/bin/ovpn_getclient', 'KONTENA_VPN_CLIENT']}
-      stdout, stderr = client(require_token).post("containers/vpn-1/exec", payload)
+      stdout, stderr = client(require_token).post("containers/#{current_grid}/vpn/vpn-1/exec", payload)
       puts stdout
     end
   end

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

@@ -11,16 +11,16 @@ module Kontena::Cli::Nodes
       token = require_token
 
       grids = client(token).get("grids/#{current_grid}/nodes")
-      puts "%-30s %-20s %-15s %-30s %-10s" % ['Name', 'OS', 'Driver', 'Labels', 'Status']
+      puts "%-30s %-40s %-15s %-30s %-10s" % ['Name', 'OS', 'Driver', 'Labels', 'Status']
       grids['nodes'].each do |node|
         if node['connected']
           status = 'online'
         else
           status = 'offline'
         end
-        puts "%-30.30s %-20.20s %-15s %-30.30s %-10s" % [
+        puts "%-30.30s %-40.40s %-15s %-30.30s %-10s" % [
           node['name'],
-          node['os'],
+          "#{node['os']} (#{node['kernel_version']})",
           node['driver'],
           (node['labels'] || ['-']).join(","),
           status
@@ -39,6 +39,8 @@ module Kontena::Cli::Nodes
       puts "  connected: #{node['connected'] ? 'yes': 'no'}"
       puts "  last connect: #{node['updated_at']}"
       puts "  public ip: #{node['public_ip']}"
+      puts "  private ip: #{node['private_ip']}"
+      puts "  overlay network: 10.81.#{node['node_number']}.0/24"
       puts "  os: #{node['os']}"
       puts "  driver: #{node['driver']}"
       puts "  kernel: #{node['kernel_version']}"

data/lib/kontena/cli/server/commands.rb

@@ -3,27 +3,11 @@ module Kontena::Cli::Server; end;
 require_relative 'server'
 require_relative 'user'
 
-command 'connect' do |c|
-  c.syntax = 'kontena connect <url>'
-  c.description = 'Connect to Kontena server'
-  c.action do |args, options|
-    Kontena::Cli::Server::Server.new.connect(args[0], options)
-  end
-end
-
-command 'disconnect' do |c|
-  c.syntax = 'kontena disconnect'
-  c.description = 'Disconnect from Kontena server'
-  c.action do |args, options|
-    Kontena::Cli::Server::Server.new.disconnect
-  end
-end
-
 command 'login' do |c|
   c.syntax = 'kontena login'
   c.description = 'Login to Kontena server'
   c.action do |args, options|
-    Kontena::Cli::Server::User.new.login
+    Kontena::Cli::Server::User.new.login(args[0])
   end
 end
 
@@ -38,16 +22,17 @@ end
 command 'whoami' do |c|
   c.syntax = 'kontena whoami'
   c.description = 'Display your Kontena email address and server url'
+  c.option '--bash-completion-path'
   c.action do |args, options|
-    Kontena::Cli::Server::User.new.whoami
+    Kontena::Cli::Server::User.new.whoami(options)
   end
 end
 
 command 'register' do |c|
   c.syntax = 'kontena register'
-  c.description = 'Register to Kontena.io'
+  c.description = 'Register Kontena account. URL of auth provider can be given optionally.'
   c.action do |args, options|
-    Kontena::Cli::Server::User.new.register
+    Kontena::Cli::Server::User.new.register(args[0], options)
   end
 end
 
@@ -82,11 +67,3 @@ command 'reset password' do |c|
     Kontena::Cli::Server::User.new.reset_password(args[0])
   end
 end
-
-command 'registry add' do |c|
-  c.syntax = 'kontena registry add'
-  c.description = 'Add registry information'
-  c.action do |args, options|
-    Kontena::Cli::Server::User.new.add_registry
-  end
-end