kontena-cli 0.12.3 → 0.13.0

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

@@ -0,0 +1,10 @@
+module Kontena::Cli::Services
+
+  require_relative 'secrets/link_command'
+  require_relative 'secrets/unlink_command'
+
+  class SecretCommand < Clamp::Command
+    subcommand "link", "Link secret from Vault", Secrets::LinkCommand
+    subcommand "unlink", "Unlink secret from Vault", Secrets::UnlinkCommand
+  end
+end

data/lib/kontena/cli/services/{add_secret_command.rb → secrets/link_command.rb}

@@ -1,10 +1,10 @@
-require_relative 'services_helper'
+require_relative '../services_helper'
 
-module Kontena::Cli::Services
-  class AddSecretCommand < Clamp::Command
+module Kontena::Cli::Services::Secrets
+  class LinkCommand < Clamp::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
-    include ServicesHelper
+    include Kontena::Cli::Services::ServicesHelper
 
     parameter "NAME", "Service name"
     parameter "SECRET", "Secret to be added from Vault (format: secret:name:type)"

data/lib/kontena/cli/services/{remove_secret_command.rb → secrets/unlink_command.rb}

@@ -1,10 +1,10 @@
-require_relative 'services_helper'
+require_relative '../services_helper'
 
-module Kontena::Cli::Services
-  class RemoveSecretCommand < Clamp::Command
+module Kontena::Cli::Services::Secrets
+  class UnlinkCommand < Clamp::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
-    include ServicesHelper
+    include Kontena::Cli::Services::ServicesHelper
 
     parameter "NAME", "Service name"
     parameter "SECRET", "Secret to be removed (format: secret:name:type)"

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

@@ -50,8 +50,13 @@ module Kontena
           puts "  scaling: #{service['container_count'] }"
           puts "  strategy: #{service['strategy']}"
           puts "  deploy_opts:"
-          puts "    wait_for_port: #{service['deploy_opts']['wait_for_port'] || '-'}"
           puts "    min_health: #{service['deploy_opts']['min_health']}"
+          if service['deploy_opts']['wait_for_port']
+            puts "    wait_for_port: #{service['deploy_opts']['wait_for_port']}"
+          end
+          if service['deploy_opts']['interval']
+            puts "    interval: #{service['deploy_opts']['interval']}"
+          end
           puts "  dns: #{service['name']}.#{grid}.kontena.local"
 
           if service['affinity'].to_a.size > 0
@@ -276,14 +281,17 @@ module Kontena
         # @param [String] memory
         # @return [Integer]
         def parse_memory(memory)
-          if memory.end_with?('k')
-            memory.to_i * 1000
-          elsif memory.end_with?('m')
-            memory.to_i * 1000000
-          elsif memory.end_with?('g')
-            memory.to_i * 1000000000
-          else
+          case memory
+          when /^\d+(k|K)$/
+            memory.to_i * 1024
+          when /^\d+(m|M)$/
+            memory.to_i * 1024 * 1024
+          when /^\d+(g|G)$/
+            memory.to_i * 1024 * 1024 * 1024
+          when /^\d+$/
             memory.to_i
+          else
+            raise ArgumentError.new("Invalid memory value: #{memory}")
           end
         end
 
@@ -319,6 +327,25 @@ module Kontena
           secrets
         end
 
+        # @param [String] time
+        # @return [Integer, NilClass]
+        def parse_relative_time(time)
+          if time.end_with?('min')
+            time.to_i * 60
+          elsif time.end_with?('h')
+            time.to_i * 60 * 60
+          elsif time.end_with?('d')
+            time.to_i * 60 * 60 * 24
+          else
+            time = time.to_i
+            if time == 0
+              nil
+            else
+              time
+            end
+          end
+        end
+
         def int_to_filesize(int)
           {
             'B'  => 1000,

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

@@ -6,6 +6,10 @@ module Kontena::Cli::Services
     include Kontena::Cli::GridOptions
     include ServicesHelper
 
+    MEM_MAX_LIMITS = [
+      1.8446744073709552e+19, 9.223372036854772e+18
+    ]
+
     parameter "NAME", "Service name"
     option ["-t", "--tail"], :flag, "Tail (follow) stats in real time", default: false
 
@@ -40,7 +44,7 @@ module Kontena::Cli::Services
 
     def render_stat_row(stat)
       memory = stat['memory'].nil? ? 'N/A' : filesize_to_human(stat['memory']['usage'])
-      if !stat['memory'].nil? && stat['memory']['limit'] != 1.8446744073709552e+19
+      if !stat['memory'].nil? && (stat['memory']['limit'] && !MEM_MAX_LIMITS.include?(stat['memory']['limit']))
         memory_limit = filesize_to_human(stat['memory']['limit'])
         memory_pct = "#{(stat['memory']['usage'].to_f / stat['memory']['limit'].to_f * 100).round(2)}%"
       else
@@ -58,6 +62,7 @@ module Kontena::Cli::Services
     # @param [Integer] size
     # @return [String]
     def filesize_to_human(size)
+      return '0B' if size.to_f == 0.0
       units = %w{B K M G T}
       e = (Math.log(size) / Math.log(1000)).floor
       s = '%.2f' % (size.to_f / 1000**e)

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

@@ -28,6 +28,7 @@ module Kontena::Cli::Services
     option "--deploy-strategy", "STRATEGY", "Deploy strategy to use (ha, daemon, random)"
     option "--deploy-wait-for-port", "PORT", "Wait for port to respond when deploying"
     option "--deploy-min-health", "FLOAT", "The minimum percentage (0.0 - 1.0) of healthy instances that do not sacrifice overall service availability while deploying"
+    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>:<type>)", multivalued: true
 
@@ -66,6 +67,9 @@ module Kontena::Cli::Services
       data[:deploy_opts] = {}
       data[:deploy_opts][:min_health] = deploy_min_health.to_f if deploy_min_health
       data[:deploy_opts][:wait_for_port] = deploy_wait_for_port.to_i if deploy_wait_for_port
+      if deploy_interval
+        data[:deploy_opts][:interval] = parse_relative_time(deploy_interval)
+      end
       data.delete(:deploy_opts) if data[:deploy_opts].empty?
       data[:pid] = pid if pid
       data

data/lib/kontena/cli/user/forgot_password_command.rb

@@ -0,0 +1,16 @@
+module Kontena::Cli::User
+  class ForgotPasswordCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    parameter "EMAIL", "Email address"
+
+    option "--auth-provider-url", "URL", "Auth provider URL", default: "https://auth.kontena.io/"
+
+    def execute
+      params = {email: email}
+      auth_client = Kontena::Client.new(auth_provider_url)
+      auth_client.post('user/password_reset', params)
+      puts 'Email with password reset instructions is sent to your email address. Please follow the instructions to change your password.'
+    end
+  end
+end

data/lib/kontena/cli/user/reset_password_command.rb

@@ -0,0 +1,23 @@
+module Kontena::Cli::User
+  class ResetPasswordCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    parameter "TOKEN", "Password reset token"
+
+    option "--auth-provider-url", "URL", "Auth provider URL", default: "https://auth.kontena.io/"
+
+    def execute
+      require 'highline/import'
+
+      password = ask("Password: ") { |q| q.echo = "*" }
+      password2 = ask("Password again: ") { |q| q.echo = "*" }
+      if password != password2
+        abort("Passwords don't match")
+      end
+      params = {token: token, password: password}
+      auth_client = Kontena::Client.new(auth_provider_url)
+      auth_client.put('user/password_reset', params)
+      puts 'Password is now changed. To login with the new password, please run: kontena login'
+    end
+  end
+end

data/lib/kontena/cli/user/verify_command.rb

@@ -0,0 +1,22 @@
+module Kontena::Cli::User
+  class VerifyCommand < Clamp::Command
+    include Kontena::Cli::Common
+
+    parameter "TOKEN", "Kontena verify token"
+
+    option "--auth-provider-url", "URL", "Auth provider URL", default: "https://auth.kontena.io/"
+
+    def execute
+      require_api_url
+
+      params = {token: token}
+      begin
+        auth_client = Kontena::Client.new(auth_provider_url)
+        auth_client.post('user/email_confirm', params)
+        puts 'Account verified'.colorize(:green)
+      rescue Kontena::Errors::StandardError
+        abort 'Invalid verify token'.colorize(:red)
+      end
+    end
+  end
+end

data/lib/kontena/cli/user_command.rb

@@ -0,0 +1,13 @@
+require_relative 'user/verify_command'
+require_relative 'user/forgot_password_command'
+require_relative 'user/reset_password_command'
+
+class Kontena::Cli::UserCommand < Clamp::Command
+
+  subcommand "verify", "Verify user account", Kontena::Cli::User::VerifyCommand
+  subcommand "forgot-password", "Request password reset for Kontena account", Kontena::Cli::User::ForgotPasswordCommand
+  subcommand "reset-password", "Reset Kontena account password", Kontena::Cli::User::ResetPasswordCommand
+
+  def execute
+  end
+end

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

@@ -10,7 +10,7 @@ module Kontena::Cli::Vault
 
       column_width_paddings = '%-54s %-25.25s'
       puts column_width_paddings % ['NAME', 'CREATED AT']
-      result['secrets'].each do |secret|
+      result['secrets'].sort_by { |s| s['name'] }.each do |secret|
         puts column_width_paddings % [secret['name'], secret['created_at']]
       end
     end

data/lib/kontena/cli/vpn_command.rb

@@ -8,7 +8,6 @@ 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 ["remove", "rm"], "Remove VPN service", Kontena::Cli::Vpn::RemoveCommand
-  subcommand "delete", "[DEPRECATED] Delete VPN service", Kontena::Cli::Vpn::DeleteCommand
 
   def execute
   end

data/lib/kontena/cli/whoami_command.rb

@@ -13,9 +13,23 @@ class Kontena::Cli::WhoamiCommand < Clamp::Command
     puts "Master: #{self.current_master['name']}"
     puts "URL: #{api_url}"
     puts "Grid: #{current_grid}"
-    token = require_token
-    user = client(token).get('user')
-    puts "User: #{user['email']}"
+    if current_master['email']
+      puts "User: #{current_master['email']}"
+    else # In case local storage doesn't have the user email yet
+      token = require_token
+      user = client(token).get('user')
+      puts "User: #{user['email']}"
+      master = {
+          'name' => current_master['name'],
+          'url' => current_master['url'],
+          'token' => current_master['token'],
+          'email' => user['email'],
+          'grid' => current_master['grid']
+      }
+
+      self.add_master(current_master['name'], master)
+    end
+
 
   end
 

data/lib/kontena/machine/aws/cloudinit_master.yml

@@ -30,6 +30,7 @@ write_files:
         -p 80:80 -p 443:443 kontena/haproxy:latest
 coreos:
   units:
+<% unless mongodb_uri -%>
     - name: kontena-server-mongo.service
       command: start
       enable: true
@@ -53,7 +54,7 @@ coreos:
         ExecStart=/usr/bin/docker run --name=kontena-server-mongo \
             --volumes-from=kontena-server-mongo-data \
             mongo:3.0 mongod --smallfiles
-
+<% end -%>
     - name: kontena-server-api.service
       command: start
       enable: true
@@ -65,11 +66,13 @@ coreos:
         After=kontena-server-mongo.service
         Description=Kontena Master
         Documentation=http://www.kontena.io/
+        Before=kontena-server-haproxy.service
+        Wants=kontena-server-haproxy.service
         Requires=network-online.target
         Requires=docker.service
+<% unless mongodb_uri -%>
         Requires=kontena-server-mongo.service
-        Before=kontena-server-haproxy.service
-        Wants=kontena-server-haproxy.service
+<% end %>
 
         [Service]
         Restart=always
@@ -79,10 +82,16 @@ coreos:
         ExecStartPre=-/usr/bin/docker rm kontena-server-api
         ExecStartPre=/usr/bin/docker pull kontena/server:${KONTENA_VERSION}
         ExecStart=/usr/bin/docker run --name kontena-server-api \
+  <% if mongodb_uri -%>
+            -e MONGODB_URI=<%= mongodb_uri %> \
+  <% else -%>
             --link kontena-server-mongo:mongodb \
             -e MONGODB_URI=mongodb://mongodb:27017/kontena_server \
+  <% end -%>
+  <% if auth_server %>
+            -e AUTH_API_URL=<%= auth_server %> \
+  <% end -%>
             -e VAULT_KEY=${KONTENA_VAULT_KEY} -e VAULT_IV=${KONTENA_VAULT_IV} \
-            <% if auth_server %>-e AUTH_API_URL=<%= auth_server %><% end %> \
             kontena/server:${KONTENA_VERSION}
 
     - name: kontena-server-haproxy.service

data/lib/kontena/machine/aws/common.rb

@@ -6,19 +6,14 @@ module Kontena
         # @param [String] region
         # @return String
         def resolve_ami(region)
-          images = {
-              'eu-central-1' => 'ami-fee2fb92',
-              'ap-northeast-1' => 'ami-26033d48',
-              'us-gov-west-1' => 'ami-bdf04cdc',
-              'sa-east-1' => 'ami-10c5457c',
-              'ap-southeast-2' => 'ami-dc8baebf',
-              'ap-southeast-1' => 'ami-6969a50a',
-              'us-east-1' => 'ami-23260749',
-              'us-west-2' => 'ami-20927640',
-              'us-west-1' => 'ami-c2e490a2',
-              'eu-west-1' => 'ami-7e72c70d'
-          }
-          images[region]
+          response = Excon.get("https://coreos.com/dist/aws/aws-stable.json")
+          images = JSON.parse(response.body)
+          info = images[region]
+          if info
+            info['hvm']
+          else
+            nil
+          end
         end
 
         # @param [String] vpc_id

data/lib/kontena/machine/aws/master_provisioner.rb

@@ -47,7 +47,8 @@ module Kontena
               auth_server: opts[:auth_server],
               version: opts[:version],
               vault_secret: opts[:vault_secret],
-              vault_iv: opts[:vault_iv]
+              vault_iv: opts[:vault_iv],
+              mongodb_uri: opts[:mongodb_uri]
           }
 
           security_group = ensure_security_group(opts[:vpc])
@@ -83,12 +84,12 @@ module Kontena
           master_url = "https://#{ec2_instance.public_ip_address}"
           Excon.defaults[:ssl_verify_peer] = false
           http_client = Excon.new(master_url, :connect_timeout => 10)
-          ShellSpinner "Waiting for #{name.colorize(:cyan)} to start" do
+          ShellSpinner "Waiting for #{name.colorize(:cyan)} to start " do
             sleep 5 until master_running?(http_client)
           end
 
           puts "Kontena Master is now running at #{master_url}"
-          puts "Use #{"kontena login #{master_url}".colorize(:light_black)} to complete Kontena Master setup"
+          puts "Use #{"kontena login --name=#{name.sub('kontena-master-', '')} #{master_url}".colorize(:light_black)} to complete Kontena Master setup"
         end
 
         ##
@@ -151,7 +152,7 @@ module Kontena
         end
 
         def generate_name
-          "kontena-master-#{super}-#{rand(1..99)}"
+          "kontena-master-#{super}-#{rand(1..9)}"
         end
 
         def master_running?(http_client)
@@ -161,7 +162,7 @@ module Kontena
         end
 
         def erb(template, vars)
-          ERB.new(template).result(
+          ERB.new(template, nil, '%<>-').result(
             OpenStruct.new(vars).instance_eval { binding }
           )
         end

data/lib/kontena/machine/azure/cloudinit_master.yml

@@ -29,8 +29,6 @@ write_files:
         -e SSL_CERT="$SSL_CERT" \
         -p 80:80 -p 443:443 kontena/haproxy:latest
 coreos:
-  update:
-      reboot-strategy: off
   units:
     - name: kontena-server-mongo.service
       command: start

data/lib/kontena/machine/digital_ocean.rb

@@ -7,6 +7,7 @@ rescue LoadError
 end
 
 require_relative 'random_name'
+require_relative 'cert_helper'
 require_relative 'digital_ocean/node_provisioner'
 require_relative 'digital_ocean/node_destroyer'
 require_relative 'digital_ocean/master_provisioner'

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

@@ -24,13 +24,6 @@ write_files:
       nameserver 172.17.43.1
       nameserver 8.8.8.8
       nameserver 8.8.4.4
-  - path: /opt/bin/floating_ip.sh
-    permissions: 0755
-    owner: root
-    content: |
-      #!/bin/sh
-      IP=$(curl -s http://169.254.169.254/metadata/v1/interfaces/public/0/anchor_ipv4/address)
-      /usr/bin/ip addr add $IP/16 dev eth0
 coreos:
   units:
     - name: 10-weave.network
@@ -41,21 +34,6 @@ coreos:
         Name=weave*
 
         [Network]
-    - name: floating-ip.service
-      command: start
-      enable: true
-      content: |
-        [Unit]
-        Description=floating-ip
-        After=network-online.target
-        Description=DigitalOcean Floating IP
-        Documentation=https://www.digitalocean.com/community/tutorials/how-to-enable-floating-ips-on-an-older-droplet#coreos
-        Requires=network-online.target
-
-        [Service]
-        Type=oneshot
-        RemainAfterExit=yes
-        ExecStart=/opt/bin/floating_ip.sh
     - name: kontena-agent.service
       command: start
       enable: true