kontena-cli 0.7.3 → 0.8.0

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

@@ -0,0 +1,38 @@
+require 'shell-spinner'
+
+module Kontena
+  module Machine
+    module DigitalOcean
+      class NodeDestroyer
+        include RandomName
+
+        attr_reader :client, :api_client
+
+        # @param [Kontena::Client] api_client Kontena api client
+        # @param [String] token Digital Ocean token
+        def initialize(api_client, token)
+          @api_client = api_client
+          @client = DropletKit::Client.new(access_token: token)
+        end
+
+        def run!(grid, name)
+          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)
+            end
+          else
+            abort "Cannot find droplet #{name.colorize(:cyan)} in DigitalOcean"
+          end
+          node = api_client.get("grids/#{grid['id']}/nodes")['nodes'].find{|n| n['name'] == name}
+          if node
+            ShellSpinner "Removing node #{name.colorize(:cyan)} from grid #{grid['name'].colorize(:cyan)} " do
+              api_client.delete("grids/#{grid['id']}/nodes/#{name}")
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,74 @@
+require 'fileutils'
+require 'erb'
+require 'open3'
+require 'shell-spinner'
+
+module Kontena
+  module Machine
+    module DigitalOcean
+      class NodeProvisioner
+        include RandomName
+
+        attr_reader :client, :api_client
+
+        # @param [Kontena::Client] api_client Kontena api client
+        # @param [String] token Digital Ocean token
+        def initialize(api_client, token)
+          @api_client = api_client
+          @client = DropletKit::Client.new(access_token: token)
+        end
+
+        def run!(opts)
+          abort('Invalid ssh key') unless File.exists?(File.expand_path(opts[:ssh_key]))
+
+          ssh_key = ssh_key(File.read(File.expand_path(opts[:ssh_key])).strip)
+          abort('Ssh key does not exist in Digital Ocean') unless ssh_key
+
+          userdata_vars = {
+            version: opts[:version],
+            master_uri: opts[:master_uri],
+            grid_token: opts[:grid_token],
+          }
+
+          droplet = DropletKit::Droplet.new(
+            name: opts[:name] || generate_name,
+            region: opts[:region],
+            image: 'coreos-stable',
+            size: opts[:size],
+            private_networking: true,
+            user_data: user_data(userdata_vars),
+            ssh_keys: [ssh_key.id]
+          )
+          created = client.droplets.create(droplet)
+          ShellSpinner "Creating DigitalOcean droplet #{droplet.name.colorize(:cyan)} " do
+            sleep 5 until client.droplets.find(id: created.id).status == 'active'
+          end
+          ShellSpinner "Waiting for node #{droplet.name.colorize(:cyan)} join to grid #{opts[:grid].colorize(:cyan)} " do
+            sleep 2 until droplet_exists_in_grid?(opts[:grid], droplet)
+          end
+        end
+
+        def user_data(vars)
+          cloudinit_template = File.join(__dir__ , '/cloudinit.yml')
+          erb(File.read(cloudinit_template), vars)
+        end
+
+        def generate_name
+          "#{super}-#{rand(1..99)}"
+        end
+
+        def ssh_key(public_key)
+          ssh_key = client.ssh_keys.all.find{|key| key.public_key == public_key}
+        end
+
+        def droplet_exists_in_grid?(grid, droplet)
+          api_client.get("grids/#{grid}/nodes")['nodes'].find{|n| n['name'] == droplet.name}
+        end
+
+        def erb(template, vars)
+          ERB.new(template).result(OpenStruct.new(vars).instance_eval { binding })
+        end
+      end
+    end
+  end
+end

data/lib/kontena/machine/random_name.rb

@@ -0,0 +1,42 @@
+module Kontena
+  module Machine
+    module RandomName
+
+      def generate_name
+        rnd = Random.rand(64)
+
+        "#{adjectives[rnd%adjectives.length]}-#{nouns[rnd%adjectives.length]}"
+      end
+
+      private
+
+      def adjectives
+        [
+            "autumn", "hidden", "bitter", "misty", "silent", "empty", "dry", "dark",
+            "summer", "icy", "delicate", "quiet", "white", "cool", "spring", "winter",
+            "patient", "twilight", "dawn", "crimson", "wispy", "weathered", "blue",
+            "billowing", "broken", "cold", "damp", "falling", "frosty", "green",
+            "long", "late", "bold", "little", "morning", "muddy",
+            "red", "rough", "still", "small", "sparkling", "shy",
+            "wandering", "withered", "wild", "black", "young", "holy", "solitary",
+            "fragrant", "aged", "snowy", "proud", "floral", "restless",
+            "polished", "purple", "lively", "nameless"
+        ]
+      end
+
+      def nouns
+        [
+            "waterfall", "river", "breeze", "moon", "rain", "wind", "sea", "morning",
+            "snow", "lake", "sunset", "pine", "shadow", "leaf", "dawn", "glitter",
+            "forest", "hill", "cloud", "meadow", "sun", "glade", "bird", "brook",
+            "butterfly", "bush", "dew", "dust", "field", "fire", "flower", "firefly",
+            "feather", "grass", "haze", "mountain", "night", "pond", "darkness",
+            "snowflake", "silence", "sound", "sky", "shape", "surf", "thunder",
+            "violet", "water", "wildflower", "wave", "water", "resonance", "sun",
+            "wood", "dream", "cherry", "tree", "fog", "frost", "voice", "paper",
+            "frog", "smoke", "star"
+        ]
+      end
+    end
+  end
+end

data/lib/kontena/machine/vagrant.rb

@@ -0,0 +1,10 @@
+require_relative 'common'
+include Kontena::Machine::Common
+
+unless which('vagrant')
+  abort('Vagrant is not installed. See https://www.vagrantup.com/ for instructions.')
+end
+
+require_relative 'random_name'
+require_relative 'vagrant/node_provisioner'
+require_relative 'vagrant/node_destroyer'

data/lib/kontena/machine/vagrant/Vagrantfile.coreos.rb.erb

@@ -0,0 +1,32 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  config.vm.provider :virtualbox do |v|
+    v.check_guest_additions = false
+    v.functional_vboxsf     = false
+  end
+
+  if Vagrant.has_plugin?("vagrant-vbguest") then
+    config.vbguest.auto_update = false
+  end
+
+  config.vm.define "<%= name %>" do |docker|
+    docker.vm.box = "coreos-stable"
+    docker.vm.box_url = "http://stable.release.core-os.net/amd64-usr/current/coreos_production_vagrant.json"
+    docker.vm.network "private_network", type: "dhcp"
+    docker.vm.hostname = "<%= name %>"
+    docker.vm.provider "virtualbox" do |vb|
+      vb.gui = false
+      vb.customize ["modifyvm", :id, "--memory", "<%= memory %>"]
+      vb.auto_nat_dns_proxy = false
+      vb.customize ["modifyvm", :id, "--natdnsproxy1", "off" ]
+      vb.customize ["modifyvm", :id, "--natdnshostresolver1", "off" ]
+    end
+    docker.vm.provision :file, :source => "<%= cloudinit %>", :destination => "/tmp/vagrantfile-user-data"
+    docker.vm.provision :shell, :inline => "mv /tmp/vagrantfile-user-data /var/lib/coreos-vagrant/", :privileged => true
+  end
+end

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

@@ -0,0 +1,65 @@
+#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=172.28.128.1
+        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}

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

@@ -0,0 +1,36 @@
+
+module Kontena
+  module Machine
+    module Vagrant
+      class NodeDestroyer
+        include RandomName
+
+        attr_reader :client, :api_client
+
+        # @param [Kontena::Client] api_client Kontena api client
+        def initialize(api_client)
+          @api_client = api_client
+        end
+
+        def run!(grid, name)
+          vagrant_path = "#{Dir.home}/.kontena/#{grid}/#{name}"
+          Dir.chdir(vagrant_path) do
+            ShellSpinner "Terminating Vagrant machine #{name.colorize(:cyan)} " do
+              Open3.popen2('vagrant destroy -f') do |stdin, output, wait|
+                while o = output.gets
+                  puts o if ENV['DEBUG']
+                end
+              end
+            end
+          end
+          node = api_client.get("grids/#{grid}/nodes")['nodes'].find{|n| n['name'] == name}
+          if node
+            ShellSpinner "Removing node #{name.colorize(:cyan)} from grid #{grid.colorize(:cyan)} " do
+              api_client.delete("grids/#{grid}/nodes/#{name}")
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/kontena/machine/vagrant/node_provisioner.rb

@@ -0,0 +1,68 @@
+require 'fileutils'
+require 'erb'
+require 'open3'
+require 'shell-spinner'
+
+module Kontena
+  module Machine
+    module Vagrant
+      class NodeProvisioner
+        include RandomName
+
+        attr_reader :client, :api_client
+
+        # @param [Kontena::Client] api_client Kontena api client
+        def initialize(api_client)
+          @api_client = api_client
+        end
+
+        def run!(opts)
+          grid = opts[:grid]
+          name = opts[:name] || generate_name
+          version = opts[:version]
+          vagrant_path = "#{Dir.home}/.kontena/#{grid}/#{name}"
+          FileUtils.mkdir_p(vagrant_path)
+
+          template = File.join(__dir__ , '/Vagrantfile.coreos.rb.erb')
+          cloudinit_template = File.join(__dir__ , '/cloudinit.yml')
+          vars = {
+            name: name,
+            version: version,
+            memory: opts[:memory] || 1024,
+            master_uri: opts[:master_uri],
+            grid_token: opts[:grid_token],
+            cloudinit: "#{vagrant_path}/cloudinit.yml"
+          }
+          vagrant_data = erb(File.read(template), vars)
+          cloudinit = erb(File.read(cloudinit_template), vars)
+          File.write("#{vagrant_path}/Vagrantfile", vagrant_data)
+          File.write("#{vagrant_path}/cloudinit.yml", cloudinit)
+          Dir.chdir(vagrant_path) do
+            ShellSpinner "Creating Vagrant machine #{name.colorize(:cyan)} " do
+              Open3.popen2('vagrant box update && vagrant up') do |stdin, output, wait|
+                while o = output.gets
+                  print o if ENV['DEBUG']
+                end
+              end
+            end
+            ShellSpinner "Waiting for node #{name.colorize(:cyan)} join to grid #{grid.colorize(:cyan)} " do
+              sleep 1 until node_exists_in_grid?(grid, name)
+            end
+          end
+        end
+
+        def generate_name
+          "#{super}-#{rand(1..99)}"
+        end
+
+        def erb(template, vars)
+          ERB.new(template).result(OpenStruct.new(vars).instance_eval { binding })
+        end
+
+        def node_exists_in_grid?(grid, name)
+          api_client.get("grids/#{grid}/nodes")['nodes'].find{|n| n['name'] == name}
+        end
+      end
+    end
+  end
+end

data/lib/kontena/scripts/completer

@@ -60,12 +60,9 @@ words = ARGV
 words.delete_at(0)
 
 completion = []
-completion.push %w(deploy forgot node grid invite service container vpn external-registry registry login logout whoami) if words.size < 2
+completion.push %w(app deploy forgot-password node grid invite service container vpn external-registry registry login logout whoami) if words.size < 2
 if words.size > 0
   case words[0]
-    when 'forgot'
-      completion.clear
-      sub_commands = %w(password)
     when 'grid'
       completion.clear
       sub_commands = %w(add-user audit-log create current list list-users remove remove-user show use)
@@ -77,7 +74,7 @@ if words.size > 0
       end
     when 'node'
       completion.clear
-      sub_commands = %w(list show remove)
+      sub_commands = %w(list show remove vagrant digitalocean)
       if words[1]
         completion.push(sub_commands) unless sub_commands.include?(words[1])
         completion.push helper.nodes
@@ -108,6 +105,9 @@ if words.size > 0
     when 'external-registry'
       completion.clear
       completion.push %w(add list delete)
+    when 'app'
+      completion.clear
+      completion.push %w(init deploy start stop remove rm ps list)
   end
 end
 

data/spec/kontena/cli/app/deploy_command_spec.rb

@@ -0,0 +1,227 @@
+require_relative "../../../spec_helper"
+require "kontena/cli/apps/deploy_command"
+
+describe Kontena::Cli::Apps::DeployCommand do
+
+  let(:subject) do
+    described_class.new(File.basename($0))
+  end
+
+  let(:settings) do
+    {'server' => {'url' => 'http://kontena.test', 'token' => token}}
+  end
+
+  let(:token) do
+    '1234567'
+  end
+
+  let(:docker_compose_yml) do
+    yml_content = <<yml
+wordpress:
+  image: wordpress:4.1
+  ports:
+    - 80:80
+  links:
+    - mysql:mysql
+mysql:
+  image: mysql:5.6
+yml
+    yml_content
+  end
+
+  let(:kontena_yml) do
+    yml_content = <<yml
+wordpress:
+  extends:
+    file: docker-compose.yml
+    service: wordpress
+  stateful: true
+  environment:
+    - WORDPRESS_DB_PASSWORD=%{prefix}_secret
+  instances: 2
+  deploy:
+    strategy: ha
+mysql:
+  extends:
+    file: docker-compose.yml
+    service: mysql
+  stateful: true
+  environment:
+    - MYSQL_ROOT_PASSWORD=%{prefix}_secret
+yml
+    yml_content
+  end
+
+  let(:services) do
+    {
+        'wordpress' => {
+            'image' => 'wordpress:latest',
+            'links' => ['mysql:db'],
+            'ports' => ['80:80'],
+            'instances' => 2,
+            'deploy' => {
+                'strategy' => 'ha'
+            }
+        },
+        'mysql' => {
+            'image' => 'mysql:5.6',
+            'stateful' => true
+        }
+    }
+  end
+
+  let(:client) do
+    double
+  end
+
+  let(:options) do
+    double({prefix: false, file: false, service: nil})
+  end
+
+  let(:env_vars) do
+    ["#comment line", "TEST_ENV_VAR=test", "MYSQL_ADMIN_PASSWORD=abcdef"]
+  end
+
+  let(:dot_env) do
+    ["TEST_ENV_VAR=test2","", "TEST_ENV_VAR2=test3"]
+  end
+
+  describe '#deploy' do
+    context 'when api_url is nil' do
+      it 'raises error' do
+        allow(subject).to receive(:settings).and_return({'server' => {}})
+        expect{subject.run([])}.to raise_error(ArgumentError)
+      end
+    end
+
+    context 'when token is nil' do
+      it 'raises error' do
+        allow(subject).to receive(:settings).and_return({'server' => {'url' => 'http://kontena.test'}})
+        expect{subject.run([])}.to raise_error(ArgumentError)
+      end
+    end
+
+    context 'when api url and token are valid' do
+      before(:each) do
+        allow(subject).to receive(:settings).and_return(settings)
+        allow(File).to receive(:exists?).and_return(true)
+        allow(File).to receive(:read).with('kontena.yml').and_return(kontena_yml)
+        allow(File).to receive(:read).with('docker-compose.yml').and_return(docker_compose_yml)
+        allow(subject).to receive(:get_service).and_raise(Kontena::Errors::StandardError.new(404, 'Not Found'))
+        allow(subject).to receive(:create_service).and_return({'id' => 'kontena-test-mysql'},{'id' => 'kontena-test-wordpress'})
+        allow(subject).to receive(:current_grid).and_return('1')
+        allow(subject).to receive(:deploy_service).and_return(nil)
+      end
+
+      it 'reads ./kontena.yml file by default' do
+        allow(subject).to receive(:settings).and_return(settings)
+        expect(File).to receive(:read).with('kontena.yml').and_return(kontena_yml)
+        subject.run([])
+      end
+
+      it 'reads given yml file' do
+        expect(File).to receive(:read).with('custom.yml').and_return(kontena_yml)
+        subject.run(["--file", "custom.yml"])
+      end
+
+      it 'uses current directory as service name prefix by default' do
+        current_dir = '/kontena/tests/stacks'
+        allow(Dir).to receive(:getwd).and_return(current_dir)
+        expect(File).to receive(:basename).with(current_dir).and_return('stacks')
+        subject.run([])
+      end
+
+      context 'when yml file has multiple env files' do
+        it 'merges environment variables correctly' do
+          allow(subject).to receive(:current_dir).and_return("kontena-test")
+          allow(YAML).to receive(:load).and_return(services)
+          services['wordpress']['environment'] = ['MYSQL_ADMIN_PASSWORD=password']
+          services['wordpress']['env_file'] = %w(/path/to/env_file .env)
+
+          expect(File).to receive(:readlines).with('/path/to/env_file').and_return(env_vars)
+          expect(File).to receive(:readlines).with('.env').and_return(dot_env)
+
+          data = {
+              :name =>"kontena-test-wordpress",
+              :image=>"wordpress:latest",
+              :env=>["MYSQL_ADMIN_PASSWORD=password", "TEST_ENV_VAR=test", "TEST_ENV_VAR2=test3"],
+              :container_count=>2,
+              :stateful=>false,
+              :links=>[{:name=>"kontena-test-mysql", :alias=>"db"}],
+              :ports=>[{:container_port=>"80", :node_port=>"80", :protocol=>"tcp"}]
+          }
+
+          expect(subject).to receive(:create_service).with('1234567', '1', data)
+          subject.run([])
+        end
+      end
+
+      context 'when yml file has one env file' do
+        it 'merges environment variables correctly' do
+          allow(subject).to receive(:current_dir).and_return("kontena-test")
+          allow(YAML).to receive(:load).and_return(services)
+          services['wordpress']['environment'] = ['MYSQL_ADMIN_PASSWORD=password']
+          services['wordpress']['env_file'] = '/path/to/env_file'
+
+          expect(File).to receive(:readlines).with('/path/to/env_file').and_return(env_vars)
+
+          data = {
+              :name =>"kontena-test-wordpress",
+              :image=>"wordpress:latest",
+              :env=>["MYSQL_ADMIN_PASSWORD=password", "TEST_ENV_VAR=test"],
+              :container_count=>2,
+              :stateful=>false,
+              :links=>[{:name=>"kontena-test-mysql", :alias=>"db"}],
+              :ports=>[{:container_port=>"80", :node_port=>"80", :protocol=>"tcp"}]
+          }
+
+          expect(subject).to receive(:create_service).with('1234567', '1', data)
+          subject.run([])
+        end
+      end
+
+      it 'creates mysql service before wordpress' do
+        allow(subject).to receive(:current_dir).and_return("kontena-test")
+        data = {:name =>"kontena-test-mysql", :image=>'mysql:5.6', :env=>["MYSQL_ROOT_PASSWORD=kontena-test_secret"], :container_count=>nil, :stateful=>true}
+        expect(subject).to receive(:create_service).with('1234567', '1', data)
+
+        subject.run([])
+      end
+
+      it 'creates wordpress service' do
+        allow(subject).to receive(:current_dir).and_return("kontena-test")
+
+        data = {
+            :name =>"kontena-test-wordpress",
+            :image=>"wordpress:4.1",
+            :env=>["WORDPRESS_DB_PASSWORD=kontena-test_secret"],
+            :container_count=>2,
+            :stateful=>true,
+            :links=>[{:name=>"kontena-test-mysql", :alias=>"mysql"}],
+            :ports=>[{:container_port=>"80", :node_port=>"80", :protocol=>"tcp"}]
+        }
+        expect(subject).to receive(:create_service).with('1234567', '1', data)
+
+        subject.run([])
+      end
+
+      it 'deploys services' do
+        allow(subject).to receive(:current_dir).and_return("kontena-test")
+        expect(subject).to receive(:deploy_service).with('1234567', 'kontena-test-mysql', {})
+        expect(subject).to receive(:deploy_service).with('1234567', 'kontena-test-wordpress', {:strategy => 'ha'})
+        subject.run([])
+      end
+
+      context 'when giving service option' do
+        it 'deploys only given services' do
+          allow(subject).to receive(:current_dir).and_return("kontena-test")
+          allow(subject).to receive(:deploy_services).and_return({})
+          expect(subject).to receive(:create).once.with('wordpress', anything).and_return({})
+          expect(subject).not_to receive(:create).with('mysql', services['mysql'])
+
+          subject.run(['wordpress'])
+        end
+      end
+    end
+  end
+end