kontena-cli 0.7.3 → 0.8.0

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

@@ -0,0 +1,17 @@
+require_relative 'services_helper'
+
+module Kontena::Cli::Services
+  class ShowCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include ServicesHelper
+
+    parameter "NAME", "Service name"
+
+    def execute
+      require_api_url
+      token = require_token
+
+      show_service(token, name)
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+require_relative 'services_helper'
+
+module Kontena::Cli::Services
+  class StartCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include ServicesHelper
+
+    parameter "NAME", "Service name"
+
+    def execute
+      require_api_url
+      token = require_token
+      result = client(token).post("services/#{parse_service_id(name)}/start", {})
+    end
+  end
+end

data/lib/kontena/cli/services/{stats.rb → stats_command.rb}

@@ -1,24 +1,25 @@
-require 'kontena/client'
-require_relative '../common'
-require 'pp'
+require_relative 'services_helper'
 
 module Kontena::Cli::Services
-  class Stats
+  class StatsCommand < Clamp::Command
     include Kontena::Cli::Common
+    include ServicesHelper
 
-    def show(service_id, options)
+    parameter "NAME", "Service name"
+    option ["-f", "--follow"], :flag, "Follow stats in real time", default: false
+
+    def execute
       require_api_url
       token = require_token
-      if options.follow
+      if follow?
         system('clear')
         render_header
       end
       loop do
-        fetch_stats(token, service_id, options.follow)
-        break unless options.follow
+        fetch_stats(token, name, follow?)
+        break unless follow?
         sleep(2)
       end
-
     end
 
     private
@@ -40,7 +41,7 @@ module Kontena::Cli::Services
       memory = stat['memory'].nil? ? 'N/A' : filesize_to_human(stat['memory']['usage'])
       if !stat['memory'].nil? && stat['memory']['limit'] != 1.8446744073709552e+19
         memory_limit = filesize_to_human(stat['memory']['limit'])
-        memory_pct = "#{(memory.to_f / memory_limit.to_f * 100).round(2)}%"
+        memory_pct = "#{(stat['memory']['usage'].to_f / stat['memory']['limit'].to_f * 100).round(2)}%"
       else
         memory_limit = 'N/A'
         memory_pct = 'N/A'

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

@@ -0,0 +1,16 @@
+require_relative 'services_helper'
+
+module Kontena::Cli::Services
+  class StopCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include ServicesHelper
+
+    parameter "NAME", "Service name"
+
+    def execute
+      require_api_url
+      token = require_token
+      result = client(token).post("services/#{parse_service_id(name)}/stop", {})
+    end
+  end
+end

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

@@ -0,0 +1,51 @@
+require_relative 'services_helper'
+
+module Kontena::Cli::Services
+  class UpdateCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include ServicesHelper
+
+    parameter "NAME", "Service name"
+
+    option "--image", "IMAGE", "Docker image to use"
+    option ["-p", "--ports"], "PORTS", "Publish a service's port to the host", multivalued: true
+    option ["-e", "--env"], "ENV", "Set environment variables", multivalued: true
+    option ["-a", "--affinity"], "AFFINITY", "Set service affinity", multivalued: true
+    option ["-c", "--cpu-shares"], "CPU_SHARES", "CPU shares (relative weight)"
+    option ["-m", "--memory"], "MEMORY", "Memory limit (format: <number><optional unit>, where unit = b, k, m or g)"
+    option ["--memory-swap"], "MEMORY_SWAP", "Total memory usage (memory + swap), set \'-1\' to disable swap (format: <number><optional unit>, where unit = b, k, m or g)"
+    option "--cmd", "CMD", "Command to execute"
+    option "--instances", "INSTANCES", "How many instances should be deployed"
+    option ["-u", "--user"], "USER", "Username who executes first process inside container"
+    option "--cap-add", "CAP_ADD", "Add capabitilies", multivalued: true
+    option "--cap-drop", "CAP_DROP", "Drop capabitilies", multivalued: true
+
+    def execute
+      require_api_url
+      token = require_token
+
+      data = parse_service_data_from_options
+      update_service(token, name, data)
+    end
+
+    ##
+    # parse given options to hash
+    # @return [Hash]
+    def parse_service_data_from_options
+      data = {}
+      data[:ports] = parse_ports(ports_list) if ports_list
+      data[:memory] = parse_memory(memory) if memory
+      data[:memory_swap] = parse_memory(memory_swap) if memory_swap
+      data[:cpu_shares] = cpu_shares if cpu_shares
+      data[:affinity] = affinity_list if affinity_list
+      data[:env] = env_list if env_list
+      data[:container_count] = instances if instances
+      data[:cmd] = cmd.split(" ") if cmd
+      data[:user] = user if user
+      data[:image] = image if image
+      data[:cap_add] = cap_add_list if cap_add_list
+      data[:cap_drop] = cap_drop_list if cap_drop_list
+      data
+    end
+  end
+end

data/lib/kontena/cli/verify_account_command.rb

@@ -0,0 +1,13 @@
+class Kontena::Cli::VerifyAccountCommand < Clamp::Command
+  include Kontena::Cli::Common
+
+  parameter "TOKEN", "Kontena verify token"
+
+  def execute
+    require_api_url
+
+    params = {token: token}
+    client.post('user/email_confirm', params)
+    puts 'Account verified'.colorize(:green)
+  end
+end

data/lib/kontena/cli/version_command.rb

@@ -0,0 +1,8 @@
+require_relative 'version'
+
+class Kontena::Cli::VersionCommand < Clamp::Command
+
+  def execute
+    puts Kontena::Cli::VERSION
+  end
+end

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

@@ -0,0 +1,12 @@
+module Kontena::Cli::Vpn
+  class ConfigCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    def execute
+      require_api_url
+      payload = {cmd: ['/usr/local/bin/ovpn_getclient', 'KONTENA_VPN_CLIENT']}
+      stdout, stderr = client(require_token).post("containers/#{current_grid}/vpn/vpn-1/exec", payload)
+      puts stdout
+    end
+  end
+end

data/lib/kontena/cli/{grids/vpn.rb → vpn/create_command.rb}

@@ -1,33 +1,33 @@
-require 'kontena/client'
-require_relative '../common'
-
-module Kontena::Cli::Grids
-  class Vpn
+module Kontena::Cli::Vpn
+  class CreateCommand < Clamp::Command
     include Kontena::Cli::Common
 
-    def create(opts)
+    option '--node', 'NODE', 'Node name where VPN is deployed'
+    option '--ip', 'IP', 'Node ip-address'
+
+    def execute
       require_api_url
       token = require_token
-      preferred_node = opts.node
+      preferred_node = node
 
       vpn = client(token).get("services/#{current_grid}/vpn") rescue nil
-      raise ArgumentError.new('Vpn already exists') if vpn
+      abort('Vpn already exists') if vpn
 
       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?
+        abort('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?
+        abort('Node not found') if node.nil?
       end
 
-      public_ip = opts.ip || node['public_ip']
+      public_ip = ip || node['public_ip']
 
       data = {
         name: 'vpn',
         stateful: true,
-        image: 'kontena/openvpn:latest',
+        image: 'kontena/openvpn:ethwe',
         ports: [
           {
             container_port: '1194',
@@ -50,22 +50,5 @@ module Kontena::Cli::Grids
       puts "OpenVPN service is now started (udp://#{public_ip}:1194)."
       puts "Use 'kontena vpn config' to fetch OpenVPN client config to your machine (it takes a while until config is ready)."
     end
-
-    def delete
-      require_api_url
-      token = require_token
-
-      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/#{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/#{current_grid}/vpn/vpn-1/exec", payload)
-      puts stdout
-    end
   end
 end

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

@@ -0,0 +1,15 @@
+module Kontena::Cli::Vpn
+  class DeleteCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    def execute
+      require_api_url
+      token = require_token
+
+      vpn = client(token).get("services/#{current_grid}/vpn") rescue nil
+      abort("VPN service does not exist") if vpn.nil?
+
+      client(token).delete("services/#{current_grid}/vpn")
+    end
+  end
+end

data/lib/kontena/cli/vpn_command.rb

@@ -0,0 +1,13 @@
+require_relative 'vpn/create_command'
+require_relative 'vpn/config_command'
+require_relative 'vpn/delete_command'
+
+class Kontena::Cli::VpnCommand < Clamp::Command
+
+  subcommand "create", "Create VPN service", Kontena::Cli::Vpn::CreateCommand
+  subcommand "config", "Show/Export VPN config", Kontena::Cli::Vpn::ConfigCommand
+  subcommand "delete", "Delete VPN service", Kontena::Cli::Vpn::DeleteCommand
+
+  def execute
+  end
+end

data/lib/kontena/cli/whoami_command.rb

@@ -0,0 +1,19 @@
+class Kontena::Cli::WhoamiCommand < Clamp::Command
+  include Kontena::Cli::Common
+
+  option '--bash-completion-path', :flag, 'Show bash completion path', hidden: true
+
+  def execute
+    if bash_completion_path?
+      puts File.realpath(File.join(__dir__, '../scripts/init'))
+      exit 0
+    end
+
+    require_api_url
+    puts "Master: #{settings['server']['url']}"
+    token = require_token
+    response = client(token).get('user')
+    puts "User: #{response['email']}"
+  end
+
+end

data/lib/kontena/client.rb

@@ -1,5 +1,5 @@
 require 'json'
-require 'httpclient'
+require 'excon'
 require_relative 'errors'
 require 'kontena/cli/version'
 
@@ -14,8 +14,8 @@ module Kontena
     # @param [String] api_url
     # @param [Hash] default_headers
     def initialize(api_url, default_headers = {})
-      @http_client = HTTPClient.new
-      @http_client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE if ignore_ssl_errors?
+      Excon.defaults[:ssl_verify_peer] = false if ignore_ssl_errors?
+      @http_client = Excon.new(api_url)
       @default_headers = {'Accept' => 'application/json', 'Content-Type' => 'application/json', 'User-Agent' => "kontena-cli/#{Kontena::Cli::VERSION}"}.merge(default_headers)
       @api_url = api_url
     end
@@ -26,7 +26,7 @@ module Kontena
     # @param [Hash,NilClass] params
     # @return [Hash]
     def get(path, params = nil, headers = {})
-      response = http_client.get(request_uri(path), params, request_headers(headers))
+      response = http_client.get(path: request_uri(path), query: params, headers: request_headers(headers))
       if response.status == 200
         parse_response(response)
       else
@@ -44,12 +44,13 @@ module Kontena
     def post(path, obj, params = {}, headers = {})
       request_headers = request_headers(headers)
       request_options = {
-          header: request_headers,
+          path: request_uri(path),
+          headers: request_headers,
           body: encode_body(obj, request_headers['Content-Type']),
           query: params
       }
 
-      response = http_client.post(request_uri(path), request_options)
+      response = http_client.post(request_options)
       if [200, 201].include?(response.status)
         parse_response(response)
       else
@@ -67,12 +68,13 @@ module Kontena
     def put(path, obj, params = {}, headers = {})
       request_headers = request_headers(headers)
       request_options = {
-          header: request_headers,
+          path: request_uri(path),
+          headers: request_headers,
           body: encode_body(obj, request_headers['Content-Type']),
           query: params
       }
 
-      response = http_client.put(request_uri(path), request_options)
+      response = http_client.put(request_options)
       if [200, 201].include?(response.status)
         parse_response(response)
       else
@@ -90,11 +92,12 @@ module Kontena
     def delete(path, body = nil, params = {}, headers = {})
       request_headers = request_headers(headers)
       request_options = {
-          header: request_headers,
+          path: request_uri(path),
+          headers: request_headers,
           body: encode_body(body, request_headers['Content-Type']),
           query: params
       }
-      response = http_client.delete(request_uri(path), request_options)
+      response = http_client.delete(request_options)
       if response.status == 200
         parse_response(response)
       else
@@ -110,7 +113,7 @@ module Kontena
     # @param [String] path
     # @return [String]
     def request_uri(path)
-      "#{@api_url}/v1/#{path}"
+      "/v1/#{path}"
     end
 
     ##

data/lib/kontena/machine/common.rb

@@ -0,0 +1,17 @@
+module Kontena
+  module Machine
+    module Common
+
+      def which(cmd)
+        exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+        ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+          exts.each { |ext|
+            exe = File.join(path, "#{cmd}#{ext}")
+            return exe if File.executable?(exe) && !File.directory?(exe)
+          }
+        end
+        return nil
+      end
+    end
+  end
+end

data/lib/kontena/machine/digital_ocean.rb

@@ -0,0 +1,11 @@
+begin
+  require "droplet_kit"
+rescue LoadError
+  puts "It seems that you don't have Digital Ocean API installed."
+  puts "Install it using: gem install droplet_kit"
+  exit 1
+end
+
+require_relative 'random_name'
+require_relative 'digital_ocean/node_provisioner'
+require_relative 'digital_ocean/node_destroyer'

data/lib/kontena/machine/digital_ocean/cloudinit.yml

@@ -0,0 +1,66 @@
+#cloud-config
+write_files:
+  - path: /etc/kontena-agent.env
+    permissions: 0600
+    owner: root
+    content: |
+      KONTENA_URI="<%= master_uri %>"
+      KONTENA_TOKEN="<%= grid_token %>"
+      KONTENA_PEER_INTERFACE=eth1
+      KONTENA_VERSION=<%= version %>
+  - path: /etc/systemd/system/docker.service.d/50-insecure-registry.conf
+    content: |
+        [Service]
+        Environment='DOCKER_OPTS=--insecure-registry="10.81.0.0/19" --bip="172.17.42.1/16"'
+coreos:
+  units:
+    - name: 00-eth.network
+      runtime: true
+      content: |
+        [Match]
+        Name=eth*
+        [Network]
+        DHCP=yes
+        DNS=172.17.42.1
+        DNS=173.245.58.51
+        DNS=173.245.59.41
+        DNS=8.8.8.8
+        DOMAINS=kontena.local
+        [DHCP]
+        UseDNS=false
+
+    - name: 10-weave.network
+      runtime: false
+      content: |
+        [Match]
+        Type=bridge
+        Name=weave*
+
+        [Network]
+    - name: kontena-agent.service
+      command: start
+      enable: true
+      content: |
+        [Unit]
+        Description=kontena-agent
+        After=network-online.target
+        After=docker.service
+        Description=Kontena Agent
+        Documentation=http://www.kontena.io/
+        Requires=network-online.target
+        Requires=docker.service
+
+        [Service]
+        Restart=always
+        RestartSec=5
+        EnvironmentFile=/etc/kontena-agent.env
+        ExecStartPre=-/usr/bin/docker stop kontena-agent
+        ExecStartPre=-/usr/bin/docker rm kontena-agent
+        ExecStartPre=/usr/bin/docker pull kontena/agent:${KONTENA_VERSION}
+        ExecStart=/usr/bin/docker run --name kontena-agent \
+            -e KONTENA_URI=${KONTENA_URI} \
+            -e KONTENA_TOKEN=${KONTENA_TOKEN} \
+            -e KONTENA_PEER_INTERFACE=${KONTENA_PEER_INTERFACE} \
+            -v=/var/run/docker.sock:/var/run/docker.sock \
+            --net=host \
+            kontena/agent:${KONTENA_VERSION}