kontena-cli 0.10.3 → 0.11.0

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

@@ -13,6 +13,11 @@ write_files:
     content: |
         [Service]
         Environment='DOCKER_OPTS=--insecure-registry="10.81.0.0/19" --bip="172.17.43.1/16"'
+  - path: /etc/sysctl.d/99-inotify.conf
+    owner: root
+    permissions: 0644
+    content: |
+      fs.inotify.max_user_instances = 8192
 coreos:
   units:
     - name: 00-eth.network

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

@@ -5,6 +5,8 @@ write_files:
     owner: root
     content: |
       KONTENA_VERSION=<%= version %>
+      KONTENA_VAULT_KEY=<%= vault_secret %>
+      KONTENA_VAULT_IV=<%= vault_iv %>
       <% if ssl_cert %>SSL_CERT="/etc/kontena-server.pem"
 
   - path: /etc/kontena-server.pem
@@ -79,6 +81,7 @@ coreos:
         ExecStart=/usr/bin/docker run --name kontena-server-api \
             --link kontena-server-mongo:mongodb \
             -e MONGODB_URI=mongodb://mongodb:27017/kontena_server \
+            -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}
 

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

@@ -37,7 +37,9 @@ module Kontena
           userdata_vars = {
               ssl_cert: ssl_cert,
               auth_server: opts[:auth_server],
-              version: opts[:version]
+              version: opts[:version],
+              vault_secret: opts[:vault_secret],
+              vault_iv: opts[:vault_iv]
           }
 
           security_group = ensure_security_group(opts[:vpc])

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

@@ -12,6 +12,11 @@ write_files:
     content: |
         [Service]
         Environment='DOCKER_OPTS=--insecure-registry="10.81.0.0/19" --bip="172.17.43.1/16"'
+  - path: /etc/sysctl.d/99-inotify.conf
+    owner: root
+    permissions: 0644
+    content: |
+      fs.inotify.max_user_instances = 8192
   - path: /etc/resolv.conf
     permissions: 0644
     owner: root

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

@@ -5,6 +5,8 @@ write_files:
     owner: root
     content: |
       KONTENA_VERSION=<%= version %>
+      KONTENA_VAULT_KEY=<%= vault_secret %>
+      KONTENA_VAULT_IV=<%= vault_iv %>
       <% if ssl_cert %>SSL_CERT="/etc/kontena-server.pem"
 
   - path: /etc/kontena-server.pem
@@ -79,6 +81,7 @@ coreos:
         ExecStart=/usr/bin/docker run --name kontena-server-api \
             --link kontena-server-mongo:mongodb \
             -e MONGODB_URI=mongodb://mongodb:27017/kontena_server \
+            -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}
 

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

@@ -44,7 +44,9 @@ module Kontena
             userdata_vars = {
                 ssl_cert: ssl_cert,
                 auth_server: opts[:auth_server],
-                version: opts[:version]
+                version: opts[:version],
+                vault_secret: opts[:vault_secret],
+                vault_iv: opts[:vault_iv]
             }
 
             params = {

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

@@ -12,6 +12,11 @@ write_files:
     content: |
         [Service]
         Environment='DOCKER_OPTS=--insecure-registry="10.81.0.0/19" --bip="172.17.43.1/16"'
+  - path: /etc/sysctl.d/99-inotify.conf
+    owner: root
+    permissions: 0644
+    content: |
+      fs.inotify.max_user_instances = 8192
   - path: /etc/resolv.conf
     permissions: 0644
     owner: root

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

@@ -5,6 +5,8 @@ write_files:
     owner: root
     content: |
       KONTENA_VERSION=<%= version %>
+      KONTENA_VAULT_KEY=<%= vault_secret %>
+      KONTENA_VAULT_IV=<%= vault_iv %>
       <% if ssl_cert %>SSL_CERT="/etc/kontena-server.pem"
 
   - path: /etc/kontena-server.pem
@@ -79,6 +81,7 @@ coreos:
         ExecStart=/usr/bin/docker run --name kontena-server-api \
             --link kontena-server-mongo:mongodb \
             -e MONGODB_URI=mongodb://mongodb:27017/kontena_server \
+            -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}
 

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

@@ -30,7 +30,9 @@ module Kontena
           userdata_vars = {
               ssl_cert: ssl_cert,
               auth_server: opts[:auth_server],
-              version: opts[:version]
+              version: opts[:version],
+              vault_secret: opts[:vault_secret],
+              vault_iv: opts[:vault_iv]
           }
 
           droplet = DropletKit::Droplet.new(
@@ -76,7 +78,7 @@ module Kontena
         end
 
         def ssh_key(public_key)
-          ssh_key = client.ssh_keys.all.find{|key| key.public_key == public_key}
+          client.ssh_keys.all.find{|key| key.public_key == public_key}
         end
 
         def master_running?

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

@@ -12,6 +12,8 @@ write_files:
     owner: root
     content: |
       KONTENA_VERSION=<%= version %>
+      KONTENA_VAULT_KEY=<%= vault_secret %>
+      KONTENA_VAULT_IV=<%= vault_iv %>
 coreos:
   update:
       reboot-strategy: off
@@ -65,6 +67,7 @@ coreos:
         ExecStart=/usr/bin/docker run --name kontena-server-api \
             --link kontena-server-mongo:mongodb \
             -e MONGODB_URI=mongodb://mongodb:27017/kontena_server \
+            -e VAULT_KEY=${KONTENA_VAULT_KEY} -e VAULT_IV=${KONTENA_VAULT_IV} \
             <% if auth_server %>-e AUTH_API_URL=<%= auth_server %><% end %> \
             -p 8080:9292 \
             kontena/server:${KONTENA_VERSION}

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

@@ -12,6 +12,11 @@ write_files:
     content: |
         [Service]
         Environment='DOCKER_OPTS=--insecure-registry="10.81.0.0/19" --bip="172.17.43.1/16"'
+  - path: /etc/sysctl.d/99-inotify.conf
+    owner: root
+    permissions: 0644
+    content: |
+      fs.inotify.max_user_instances = 8192
 coreos:
   units:
     - name: 00-eth.network

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

@@ -21,6 +21,8 @@ module Kontena
           version = opts[:version]
           memory = opts[:memory] || 1024
           auth_server = opts[:auth_server]
+          vault_secret = opts[:vault_secret]
+          vault_iv = opts[:vault_iv]
           vagrant_path = "#{Dir.home}/.kontena/vagrant_master/"
           if Dir.exist?(vagrant_path)
             abort("Oops... cannot create Kontena Master! You can run only one Kontena Master with Vagrant".colorize(:red))
@@ -34,6 +36,8 @@ module Kontena
             version: version,
             memory: memory,
             auth_server: auth_server,
+            vault_secret: vault_secret,
+            vault_iv: vault_iv,
             cloudinit: "#{vagrant_path}/cloudinit.yml"
           }
           vagrant_data = erb(File.read(template), vars)

data/lib/kontena/scripts/completer

@@ -63,6 +63,16 @@ class Helper
     []
   end
 
+  def master_names
+    config_file = File.expand_path('~/.kontena_client.json')
+    if(File.exist?(config_file))
+      config = JSON.parse(File.read(config_file))
+      return config['servers'].map{|s| s['name']}
+    end
+  rescue
+    []
+  end
+
 end
 
 helper = Helper.new
@@ -94,8 +104,10 @@ if words.size > 0
       end
     when 'master'
       completion.clear
-      sub_commands = %w(vagrant digitalocean azure aws)
-      if words[1]
+      sub_commands = %w(list use vagrant digitalocean azure aws)
+      if words[1] && words[1] == 'use'
+        completion.push helper.master_names
+      elsif words[1]
         completion.push(sub_commands) unless sub_commands.include?(words[1])
         completion.push %w(create)
       else

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

@@ -8,7 +8,28 @@ describe Kontena::Cli::Apps::DeployCommand do
   end
 
   let(:settings) do
-    {'server' => {'url' => 'http://kontena.test', 'token' => token}}
+    {'current_server' => 'alias',
+     'servers' => [
+         {'name' => 'some_master', 'url' => 'some_master'},
+         {'name' => 'alias', 'url' => 'someurl', 'token' => token}
+     ]
+    }
+  end
+
+  let(:settings_without_api_url) do
+    {'current_server' => 'alias',
+     'servers' => [
+         {'name' => 'alias', 'token' => token}
+     ]
+    }
+  end
+
+  let(:settings_without_token) do
+    {'current_server' => 'alias',
+     'servers' => [
+         {'name' => 'alias', 'url' => 'url'}
+     ]
+    }
   end
 
   let(:token) do
@@ -87,16 +108,21 @@ yml
   end
 
   describe '#deploy' do
+
+    before(:each) do
+      allow(subject).to receive(:wait_for_deploy_to_finish).and_return(true)
+    end
+
     context 'when api_url is nil' do
       it 'raises error' do
-        allow(subject).to receive(:settings).and_return({'server' => {}})
+        allow(subject).to receive(:settings).and_return(settings_without_api_url)
         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'}})
+        allow(subject).to receive(:settings).and_return(settings_without_token)
         expect{subject.run([])}.to raise_error(ArgumentError)
       end
     end
@@ -256,7 +282,14 @@ yml
   describe '#parse_data' do
     it 'adds empty hooks hash if not defined' do
       data = {'image' => 'foo/bar:latest'}
-      subject.send(:parse_data, data)
+      result = subject.send(:parse_data, data)
+      expect(result[:hooks]).to eq({})
+    end
+
+    it 'read secrets if defined' do
+      data = {'image' => 'foo/bar:latest', 'secrets' => [{'secret' => 'MYSQL_ADMIN_PASSWORD', 'name' =>  'WORDPRESS_DB_PASSWORD', 'type' => 'env'}]}
+      result = subject.send(:parse_data, data)
+      expect(result[:secrets]).to eq([{'secret' => 'MYSQL_ADMIN_PASSWORD', 'name' => 'WORDPRESS_DB_PASSWORD', 'type' => 'env'}])
     end
   end
 end

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

@@ -8,7 +8,12 @@ describe Kontena::Cli::Apps::ScaleCommand do
   end
 
   let(:settings) do
-    {'server' => {'url' => 'http://kontena.test', 'token' => token}}
+    {'current_server' => 'alias',
+     'servers' => [
+         {'name' => 'some_master', 'url' => 'some_master'},
+         {'name' => 'alias', 'url' => 'someurl', 'token' => token}
+     ]
+    }
   end
 
   let(:token) do

data/spec/kontena/cli/common_spec.rb

@@ -3,6 +3,10 @@ require "kontena/cli/common"
 
 describe Kontena::Cli::Common do
 
+  let(:masters) do
+
+  end
+
   let(:subject) do
     Class.new do
       include Kontena::Cli::Common
@@ -10,12 +14,20 @@ describe Kontena::Cli::Common do
   end
 
   before(:each) do
-    allow(subject).to receive(:settings).and_return({'server' => {}})
+    allow(subject).to receive(:settings).and_return({'current_server' => 'default',
+                                                     'servers' => [{}]
+                                                    })
     allow(subject).to receive(:save_settings)
   end
 
   describe '#current_grid' do
     it 'returns nil by default' do
+      allow(subject).to receive(:settings).and_return({'current_server' => 'alias',
+                                                       'servers' => [
+                                                           {'name' => 'some_master', 'url' => 'some_master'},
+                                                           {'name' => 'alias', 'url' => 'someurl'}
+                                                       ]
+                                                      })
       expect(subject.current_grid).to eq(nil)
     end
 
@@ -23,6 +35,17 @@ describe Kontena::Cli::Common do
       expect(ENV).to receive(:[]).with('KONTENA_GRID').and_return('foo')
       expect(subject.current_grid).to eq('foo')
     end
+
+    it 'returns grid from json' do
+      allow(subject).to receive(:settings).and_return({'current_server' => 'alias',
+                                                       'servers' => [
+                                                           {'name' => 'some_master', 'url' => 'some_master'},
+                                                           {'name' => 'alias', 'url' => 'someurl', 'grid' => 'foo_grid'}
+                                                       ]
+                                                      })
+      expect(subject.current_grid).to eq('foo_grid')
+    end
+
   end
 
   describe '#api_url' do
@@ -50,4 +73,49 @@ describe Kontena::Cli::Common do
       expect(subject.require_token).to eq('secret_token')
     end
   end
+
+  describe '#current_master' do
+    it 'return correct master info' do
+      allow(subject).to receive(:settings).and_return({'current_server' => 'alias',
+                                                       'servers' => [
+                                                           {'name' => 'some_master', 'url' => 'some_master'},
+                                                           {'name' => 'alias', 'url' => 'someurl'}
+                                                       ]
+                                                      })
+
+      expect(subject.current_master['url']).to eq('someurl')
+      expect(subject.current_master['name']).to eq('alias')
+
+    end
+  end
+
+  describe '#settings' do
+    it 'migrates old settings' do
+      RSpec::Mocks.space.proxy_for(subject).reset
+
+      allow(File).to receive(:exists?).and_return(true)
+      allow(File).to receive(:read).and_return('{
+        "server": {
+          "url": "https://master.domain.com:8443",
+          "grid": "my-grid",
+          "token": "kontena-token"
+        }
+      }')
+      expected_settings = {
+          'current_server' => 'default',
+          'servers' => [
+              {
+                  "url" => "https://master.domain.com:8443",
+                  "grid" => "my-grid",
+                  "token" => "kontena-token",
+                  "name" => "default"
+              }
+          ]
+      }
+      expect(File).to receive(:write).with(subject.settings_filename, JSON.pretty_generate(expected_settings))
+
+      subject.settings
+    end
+
+  end
 end

data/spec/kontena/cli/deploy_command_spec.rb

@@ -8,9 +8,31 @@ describe Kontena::Cli::DeployCommand do
   end
 
   let(:settings) do
-    {'server' => {'url' => 'http://kontena.test', 'token' => token}}
+    {'current_server' => 'alias',
+     'servers' => [
+         {'name' => 'some_master', 'url' => 'some_master'},
+         {'name' => 'alias', 'url' => 'someurl', 'token' => token}
+     ]
+    }
+  end
+
+  let(:settings_without_api_url) do
+    {'current_server' => 'alias',
+     'servers' => [
+         {'name' => 'alias', 'token' => token}
+     ]
+    }
+  end
+
+  let(:settings_without_token) do
+    {'current_server' => 'alias',
+     'servers' => [
+         {'name' => 'alias', 'url' => 'url'}
+     ]
+    }
   end
 
+
   let(:token) do
     '1234567'
   end
@@ -75,14 +97,14 @@ yml
   describe '#deploy' do
     context 'when api_url is nil' do
       it 'raises error' do
-        allow(subject).to receive(:settings).and_return({'server' => {}})
+        allow(subject).to receive(:settings).and_return(settings_without_api_url)
         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'}})
+        allow(subject).to receive(:settings).and_return(settings_without_token)
         expect{subject.run([])}.to raise_error(ArgumentError)
       end
     end
@@ -118,6 +140,10 @@ yml
       end
 
       context 'when yml file has multiple env files' do
+        before(:each) do
+          allow(subject).to receive(:settings).and_return(settings)
+        end
+
         it 'merges environment variables correctly' do
           allow(subject).to receive(:current_dir).and_return("kontena-test")
           allow(YAML).to receive(:load).and_return(services)