kontena-cli 0.11.7 → 0.12.0

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

@@ -3,6 +3,7 @@ require_relative 'services_helper'
 module Kontena::Cli::Services
   class StopCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
     include ServicesHelper
 
     parameter "NAME", "Service name"

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

@@ -0,0 +1,25 @@
+require_relative '../grid_options'
+require_relative 'services_helper'
+
+module Kontena::Cli::Services
+  class UnlinkCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
+    include ServicesHelper
+
+    parameter "NAME", "Service name"
+    parameter "TARGET", "Link target service name"
+
+    def execute
+      require_api_url
+      token = require_token
+
+      service = client(token).get("services/#{parse_service_id(name)}")
+      links = service['links'].map{|l| {name: l['grid_service_id'].split('/')[1], alias: l['alias']} }
+      abort("Service is not linked to #{target.to_s}") unless links.find{|l| l[:name] == target.to_s}
+      links.delete_if{|l| l[:name] == target.to_s}
+      data = {links: links}
+      update_service(token, name, data)
+    end
+  end
+end

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

@@ -3,6 +3,7 @@ require_relative 'services_helper'
 module Kontena::Cli::Services
   class UpdateCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
     include ServicesHelper
 
     parameter "NAME", "Service name"
@@ -24,11 +25,11 @@ module Kontena::Cli::Services
     option "--net", "NET", "Network mode"
     option "--log-driver", "LOG_DRIVER", "Set logging driver"
     option "--log-opt", "LOG_OPT", "Add logging options", multivalued: true
-    option "--deploy-strategy", "STRATEGY", "Deploy strategy to use (ha, random)"
+    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 "--pid", "PID", "Pid namespace to use"
-    option "--secret", "SECRET", "Import secret from Vault", multivalued: true
+    option "--secret", "SECRET", "Import secret from Vault (format: <secret>:<name>:<type>)", multivalued: true
 
     def execute
       require_api_url
@@ -51,7 +52,7 @@ module Kontena::Cli::Services
       data[:cpu_shares] = cpu_shares if cpu_shares
       data[:affinity] = affinity_list unless affinity_list.empty?
       data[:env] = env_list unless env_list.empty?
-      data[:secrets] = parse_secrets(secret_list)
+      data[:secrets] = parse_secrets(secret_list) unless secret_list.empty?
       data[:container_count] = instances if instances
       data[:cmd] = cmd.split(" ") if cmd
       data[:user] = user if user

data/lib/kontena/cli/users_command.rb

@@ -0,0 +1,15 @@
+require_relative 'users/invite_command'
+require_relative 'users/list_command'
+require_relative 'users/add_role_command'
+require_relative 'users/remove_role_command'
+
+class Kontena::Cli::UsersCommand < Clamp::Command
+
+  subcommand "invite", "Invite user to Kontena Master", Kontena::Cli::Users::InviteCommand
+  subcommand ["list", "ls"], "List users", Kontena::Cli::Users::ListCommand
+  subcommand "add-role", "Add role to user", Kontena::Cli::Users::AddRoleCommand
+  subcommand "remove-role", "Remove role from user", Kontena::Cli::Users::RemoveRoleCommand
+
+  def execute
+  end
+end

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

@@ -1,6 +1,7 @@
 module Kontena::Cli::Vault
   class ListCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
 
     def execute
       require_api_url

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

@@ -1,6 +1,7 @@
 module Kontena::Cli::Vault
   class ReadCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
 
     parameter "NAME", "Secret name"
 

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

@@ -1,6 +1,7 @@
 module Kontena::Cli::Vault
   class RemoveCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
 
     parameter "NAME", "Secret name"
 

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

@@ -1,6 +1,7 @@
 module Kontena::Cli::Vault
   class WriteCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
 
     parameter 'NAME', 'Secret name'
     parameter '[VALUE]', 'Secret value'

data/lib/kontena/cli/version_command.rb

@@ -1,8 +1,16 @@
 require_relative 'version'
 
 class Kontena::Cli::VersionCommand < Clamp::Command
+  include Kontena::Cli::Common
 
   def execute
-    puts Kontena::Cli::VERSION
+    url = api_url rescue nil
+    puts "cli: #{Kontena::Cli::VERSION}"
+    if url
+      resp = JSON.parse(client.http_client.get(path: '/').body) rescue nil
+      if resp
+        puts "master: #{resp['version']} (#{url})"
+      end
+    end
   end
 end

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

@@ -1,6 +1,7 @@
 module Kontena::Cli::Vpn
   class ConfigCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
 
     def execute
       require 'rbconfig'

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

@@ -3,6 +3,7 @@ require 'shell-spinner'
 module Kontena::Cli::Vpn
   class CreateCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
 
     option '--node', 'NODE', 'Node name where VPN is deployed'
     option '--ip', 'IP', 'Node ip-address'

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

@@ -1,8 +1,10 @@
 module Kontena::Cli::Vpn
   class DeleteCommand < Clamp::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::GridOptions
 
     def execute
+       puts "DEPRECATION WARNING: Support for 'kontena vpn delete' will be dropped. Use 'kontena vpn remove' instead.".colorize(:red)
       require_api_url
       token = require_token
 

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

@@ -0,0 +1,15 @@
+module Kontena::Cli::Vpn
+  class RemoveCommand < 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

@@ -1,12 +1,14 @@
 require_relative 'vpn/create_command'
 require_relative 'vpn/config_command'
+require_relative 'vpn/remove_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
+  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/machine/aws/node_destroyer.rb

@@ -17,7 +17,7 @@ module Kontena
         end
 
         def run!(grid, name)
-          instance = client.servers.all({'tag:kontena_name' => name}).first
+          instance = client.servers.all({'tag:Name' => name}).first
           if instance
             ShellSpinner "Terminating AWS instance #{name.colorize(:cyan)} " do
               instance.destroy

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

@@ -0,0 +1,70 @@
+#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=<%= peer_interface %>
+      KONTENA_VERSION=<%= version %>
+  - path: /etc/systemd/system/docker.service.d/50-kontena.conf
+    content: |
+        [Service]
+        Environment='DOCKER_OPTS=--insecure-registry="10.81.0.0/19" --bip="<%= docker_bip %>"'
+  - path: /etc/sysctl.d/99-inotify.conf
+    owner: root
+    permissions: 0644
+    content: |
+      fs.inotify.max_user_instances = 8192
+coreos:
+  units:
+    - name: 00-eth.network
+      runtime: true
+      content: |
+        [Match]
+        Name=eth*
+        [Network]
+        DHCP=yes
+        <% dns_servers.each do |dns| %>DNS=<%= dns %>
+        <% end %>
+        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 \
+            -v=/etc/kontena-agent.env:/etc/kontena.env \
+            --net=host \
+            kontena/agent:${KONTENA_VERSION}

data/lib/kontena/machine/cloud_config/node_generator.rb

@@ -0,0 +1,28 @@
+require 'fileutils'
+require 'erb'
+
+module Kontena
+  module Machine
+    module CloudConfig
+      class NodeGenerator
+
+        # @param [Hash] opts
+        def generate(opts)
+          user_data(opts)
+        end
+
+        # @param [Hash] vars
+        def user_data(vars)
+          cloudinit_template = File.join(__dir__ , '/cloudinit.yml')
+          erb(File.read(cloudinit_template), vars)
+        end
+
+        # @param [String] template
+        # @param [Hash] vars
+        def erb(template, vars)
+          ERB.new(template).result(OpenStruct.new(vars).instance_eval { binding })
+        end
+      end
+    end
+  end
+end

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

@@ -24,6 +24,13 @@ 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
@@ -34,6 +41,21 @@ 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

data/lib/kontena/machine/digital_ocean/node_destroyer.rb

@@ -19,8 +19,10 @@ module Kontena
           droplet = client.droplets.all.find{|d| d.name == name}
           if droplet
             ShellSpinner "Terminating DigitalOcean droplet #{name.colorize(:cyan)} " do
-              client.droplets.delete(id: droplet.id)
-              sleep 2 until client.droplets.find(id: droplet.id).is_a?(String)
+              result = client.droplets.delete(id: droplet.id)
+              if result.is_a?(String)
+                abort "Cannot delete droplet #{name.colorize(:cyan)} in DigitalOcean"
+              end
             end
           else
             abort "Cannot find droplet #{name.colorize(:cyan)} in DigitalOcean"

data/lib/kontena/machine/random_name.rb

@@ -3,9 +3,9 @@ module Kontena
     module RandomName
 
       def generate_name
-        rnd = Random.rand(64)
-
-        "#{adjectives[rnd%adjectives.length]}-#{nouns[rnd%adjectives.length]}"
+        rnd1 = Random.rand(64)
+        rnd2 = Random.rand(64)
+        "#{adjectives[rnd1%adjectives.length]}-#{nouns[rnd2%adjectives.length]}"
       end
 
       private

data/lib/kontena/scripts/completer

@@ -81,7 +81,7 @@ words = ARGV
 words.delete_at(0)
 
 completion = []
-completion.push %w(app deploy forgot-password master node grid invite service container vpn external-registry registry login logout whoami) if words.size < 2
+completion.push %w(app deploy forgot-password master node grid service container vpn external-registry registry login logout whoami) if words.size < 2
 if words.size > 0
   case words[0]
     when 'grid'
@@ -104,9 +104,12 @@ if words.size > 0
       end
     when 'master'
       completion.clear
-      sub_commands = %w(list use vagrant digitalocean azure aws)
+      sub_commands = %w(list use vagrant digitalocean azure aws users)
       if words[1] && words[1] == 'use'
         completion.push helper.master_names
+      elsif words[1] && words[1] == 'users'
+        users_sub_commands = %(invite list add-role remove-role)
+        completion.push users_sub_commands
       elsif words[1]
         completion.push(sub_commands) unless sub_commands.include?(words[1])
         completion.push %w(create)
@@ -116,7 +119,8 @@ if words.size > 0
     when 'service'
       completion.clear
       sub_commands = %w(containers create delete deploy list logs restart
-                      scale show start stats stop update monitor)
+                      scale show start stats stop update monitor envs
+                      add-env remove-env add-secret remove-secret)
       if words[1]
         completion.push(sub_commands) unless sub_commands.include?(words[1])
         completion.push helper.services

data/spec/fixtures/docker-compose.yml

@@ -0,0 +1,8 @@
+wordpress:
+  image: wordpress:4.1
+  ports:
+    - 80:80
+  links:
+    - mysql:mysql
+mysql:
+  image: mysql:5.6

data/spec/fixtures/kontena.yml

@@ -0,0 +1,17 @@
+wordpress:
+  extends:
+    file: docker-compose.yml
+    service: wordpress
+  stateful: true
+  environment:
+    - WORDPRESS_DB_PASSWORD=%{project}_secret
+  instances: 2
+  deploy:
+    strategy: ha
+mysql:
+  extends:
+    file: docker-compose.yml
+    service: mysql
+  stateful: true
+  environment:
+    - MYSQL_ROOT_PASSWORD=%{project}_secret

data/spec/fixtures/mysql.yml

@@ -0,0 +1,3 @@
+mysql:
+  image: mysql:5.6
+