kontena-cli 0.9.3 → 0.10.0

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

@@ -8,7 +8,7 @@ module Kontena::Cli::Services
     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 ["-p", "--ports"], "PORT", "Publish a service's port to the host", multivalued: true
     option ["-e", "--env"], "ENV", "Set environment variables", multivalued: true
     option ["-l", "--link"], "LINK", "Add link to another service in the form of name:alias", multivalued: true
     option ["-a", "--affinity"], "AFFINITY", "Set service affinity", multivalued: true
@@ -24,6 +24,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-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"
+
 
     def execute
       require_api_url
@@ -38,6 +43,7 @@ module Kontena::Cli::Services
     # @return [Hash]
     def parse_service_data_from_options
       data = {}
+      data[:strategy] = deploy_strategy if deploy_strategy
       data[:ports] = parse_ports(ports_list) unless ports_list.empty?
       data[:links] = parse_links(link_list) unless link_list.empty?
       data[:memory] = parse_memory(memory) if memory
@@ -55,6 +61,11 @@ module Kontena::Cli::Services
       data[:net] = net if net
       data[:log_driver] = log_driver if log_driver
       data[:log_opts] = parse_log_opts(log_opt_list)
+      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
+      data.delete(:deploy_opts) if data[:deploy_opts].empty?
+      data[:pid] = pid if pid
       data
     end
   end

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

@@ -24,7 +24,7 @@ write_files:
       fi
       /usr/bin/docker run --name=kontena-server-haproxy \
         --link kontena-server-api:kontena-server-api \
-        -e SSL_CERT="$SSL_CERT" -e BACKEND_PORT=9292 \
+        -e SSL_CERT="$SSL_CERT" \
         -p 80:80 -p 443:443 kontena/haproxy:latest
 coreos:
   update:
@@ -102,4 +102,4 @@ coreos:
         ExecStartPre=-/usr/bin/docker stop kontena-server-haproxy
         ExecStartPre=-/usr/bin/docker rm kontena-server-haproxy
         ExecStartPre=/usr/bin/docker pull kontena/haproxy:latest
-        ExecStart=/opt/bin/kontena-haproxy.sh
+        ExecStart=/opt/bin/kontena-haproxy.sh

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

@@ -24,7 +24,7 @@ write_files:
       fi
       /usr/bin/docker run --name=kontena-server-haproxy \
         --link kontena-server-api:kontena-server-api \
-        -e SSL_CERT="$SSL_CERT" -e BACKEND_PORT=9292 \
+        -e SSL_CERT="$SSL_CERT" \
         -p 80:80 -p 443:443 kontena/haproxy:latest
 coreos:
   update:
@@ -102,4 +102,4 @@ coreos:
         ExecStartPre=-/usr/bin/docker stop kontena-server-haproxy
         ExecStartPre=-/usr/bin/docker rm kontena-server-haproxy
         ExecStartPre=/usr/bin/docker pull kontena/haproxy:latest
-        ExecStart=/opt/bin/kontena-haproxy.sh
+        ExecStart=/opt/bin/kontena-haproxy.sh

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

@@ -24,7 +24,7 @@ write_files:
       fi
       /usr/bin/docker run --name=kontena-server-haproxy \
         --link kontena-server-api:kontena-server-api \
-        -e SSL_CERT="$SSL_CERT" -e BACKEND_PORT=9292 \
+        -e SSL_CERT="$SSL_CERT" \
         -p 80:80 -p 443:443 kontena/haproxy:latest
 coreos:
   update:
@@ -102,4 +102,4 @@ coreos:
         ExecStartPre=-/usr/bin/docker stop kontena-server-haproxy
         ExecStartPre=-/usr/bin/docker rm kontena-server-haproxy
         ExecStartPre=/usr/bin/docker pull kontena/haproxy:latest
-        ExecStart=/opt/bin/kontena-haproxy.sh
+        ExecStart=/opt/bin/kontena-haproxy.sh

data/lib/kontena/scripts/completer

@@ -103,7 +103,8 @@ if words.size > 0
       end
     when 'service'
       completion.clear
-      sub_commands = %w(containers create delete deploy list logs restart scale show start stats stop update)
+      sub_commands = %w(containers create delete deploy list logs restart
+                      scale show start stats stop update monitor)
       if words[1]
         completion.push(sub_commands) unless sub_commands.include?(words[1])
         completion.push helper.services
@@ -127,7 +128,8 @@ if words.size > 0
       completion.push %w(add list delete)
     when 'app'
       completion.clear
-      sub_commands = %w(init build deploy start stop remove rm ps list logs)
+      sub_commands = %w(init build deploy start stop remove rm ps list
+                        logs monitor show)
       if words[1]
         completion.push(sub_commands) unless sub_commands.include?(words[1])
         completion.push helper.yml_services

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

@@ -147,11 +147,12 @@ yml
               :env=>["MYSQL_ADMIN_PASSWORD=password", "TEST_ENV_VAR=test", "TEST_ENV_VAR2=test3"],
               :container_count=>2,
               :stateful=>false,
+              :strategy=>'ha',
               :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)
+          expect(subject).to receive(:create_service).with('1234567', '1', hash_including(data))
           subject.run([])
         end
       end
@@ -171,11 +172,12 @@ yml
               :env=>["MYSQL_ADMIN_PASSWORD=password", "TEST_ENV_VAR=test"],
               :container_count=>2,
               :stateful=>false,
+              :strategy=>'ha',
               :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)
+          expect(subject).to receive(:create_service).with('1234567', '1', hash_including(data))
           subject.run([])
         end
       end
@@ -190,18 +192,25 @@ yml
             :env=> nil,
             :container_count=>2,
             :stateful=>false,
+            :strategy=>'ha',
             :links=>[{:name => "kontena-test-mysql", :alias => "db"}, {:name => "loadbalancer", :alias => "loadbalancer"}],
             :ports=>[{:container_port => "80", :node_port => "80", :protocol => "tcp"}]
         }
 
-        expect(subject).to receive(:create_service).with('1234567', '1', data)
+        expect(subject).to receive(:create_service).with('1234567', '1', hash_including(data))
         subject.run([])
       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)
+        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', hash_including(data))
 
         subject.run([])
       end
@@ -215,10 +224,11 @@ yml
             :env=>["WORDPRESS_DB_PASSWORD=kontena-test_secret"],
             :container_count=>2,
             :stateful=>true,
+            :strategy=>'ha',
             :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)
+        expect(subject).to receive(:create_service).with('1234567', '1', hash_including(data))
 
         subject.run([])
       end
@@ -226,7 +236,7 @@ yml
       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'})
+        expect(subject).to receive(:deploy_service).with('1234567', 'kontena-test-wordpress', {})
         subject.run([])
       end
 
@@ -242,4 +252,11 @@ yml
       end
     end
   end
+
+  describe '#parse_data' do
+    it 'adds empty hooks hash if not defined' do
+      data = {'image' => 'foo/bar:latest'}
+      subject.send(:parse_data, data)
+    end
+  end
 end

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

@@ -0,0 +1,64 @@
+require_relative "../../../spec_helper"
+require "kontena/cli/apps/scale_command"
+
+describe Kontena::Cli::Apps::ScaleCommand 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(:kontena_yml) do
+    yml_content = <<yml
+wordpress:
+  image: wordpress:latest
+  instances: 2
+yml
+  end
+
+  let(:kontena_yml_no_instances) do
+    yml_content = <<yml
+wordpress:
+  image: wordpress:latest
+yml
+  end
+
+  describe '#execute' do
+    before(:each) do
+      allow(subject).to receive(:settings).and_return(settings)
+      allow(subject).to receive(:current_dir).and_return("kontena-test")
+      allow(File).to receive(:exists?).and_return(true)
+      allow(File).to receive(:read).with("#{Dir.getwd}/kontena.yml").and_return(kontena_yml)
+    end
+
+    context 'when service already contains instances property' do
+      it 'aborts execution' do
+        expect{
+          subject.run(['wordpress', 3])
+        }.to raise_error(SystemExit)
+      end
+    end
+
+    context 'when service not found in YML' do
+      it 'aborts execution' do
+        expect{
+          subject.run(['mysql', 3])
+        }.to raise_error(SystemExit)
+      end
+    end
+
+    it 'scales given service' do
+      allow(File).to receive(:read).with("#{Dir.getwd}/kontena.yml").and_return(kontena_yml_no_instances)
+      expect(subject).to receive(:scale_service).with('1234567','kontena-test-wordpress',3)
+      subject.run(['wordpress', 3])
+    end
+
+  end
+end

data/spec/kontena/cli/services/services_helper_spec.rb

@@ -47,13 +47,6 @@ module Kontena::Cli::Services
         expect(client).to receive(:post).with('services/test-grid/1/deploy', {'strategy' => 'ha'})
         subject.deploy_service(token, '1', {'strategy' => 'ha'})
       end
-
-      it 'polls Kontena Server until service is running' do
-        allow(client).to receive(:post).with('services/test-grid/1/deploy', anything)
-        expect(client).to receive(:get).with('services/test-grid/1').twice.and_return({'state' => 'deploying'}, {'state' => 'running'})
-
-        subject.deploy_service(token, '1', {'strategy' => 'ha'})
-      end
     end
 
     describe '#parse_ports' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-cli
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.10.0
 platform: ruby
 authors:
 - Kontena, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -137,7 +137,10 @@ files:
 - lib/kontena/cli/apps/kontena_yml_generator.rb
 - lib/kontena/cli/apps/list_command.rb
 - lib/kontena/cli/apps/logs_command.rb
+- lib/kontena/cli/apps/monitor_command.rb
 - lib/kontena/cli/apps/remove_command.rb
+- lib/kontena/cli/apps/scale_command.rb
+- lib/kontena/cli/apps/show_command.rb
 - lib/kontena/cli/apps/start_command.rb
 - lib/kontena/cli/apps/stop_command.rb
 - lib/kontena/cli/common.rb
@@ -145,6 +148,7 @@ files:
 - lib/kontena/cli/containers/exec_command.rb
 - lib/kontena/cli/containers/inspect_command.rb
 - lib/kontena/cli/deploy_command.rb
+- lib/kontena/cli/etcd/common.rb
 - lib/kontena/cli/etcd/get_command.rb
 - lib/kontena/cli/etcd/list_command.rb
 - lib/kontena/cli/etcd/mkdir_command.rb
@@ -162,6 +166,7 @@ files:
 - lib/kontena/cli/grids/common.rb
 - lib/kontena/cli/grids/create_command.rb
 - lib/kontena/cli/grids/current_command.rb
+- lib/kontena/cli/grids/env_command.rb
 - lib/kontena/cli/grids/list_command.rb
 - lib/kontena/cli/grids/list_users_command.rb
 - lib/kontena/cli/grids/logs_command.rb
@@ -202,6 +207,7 @@ files:
 - lib/kontena/cli/nodes/list_command.rb
 - lib/kontena/cli/nodes/remove_command.rb
 - lib/kontena/cli/nodes/show_command.rb
+- lib/kontena/cli/nodes/ssh_command.rb
 - lib/kontena/cli/nodes/update_command.rb
 - lib/kontena/cli/nodes/vagrant/create_command.rb
 - lib/kontena/cli/nodes/vagrant/restart_command.rb
@@ -222,8 +228,10 @@ files:
 - lib/kontena/cli/services/create_command.rb
 - lib/kontena/cli/services/delete_command.rb
 - lib/kontena/cli/services/deploy_command.rb
+- lib/kontena/cli/services/envs_command.rb
 - lib/kontena/cli/services/list_command.rb
 - lib/kontena/cli/services/logs_command.rb
+- lib/kontena/cli/services/monitor_command.rb
 - lib/kontena/cli/services/remove_env_command.rb
 - lib/kontena/cli/services/restart_command.rb
 - lib/kontena/cli/services/scale_command.rb
@@ -277,6 +285,7 @@ files:
 - spec/kontena/cli/app/common_spec.rb
 - spec/kontena/cli/app/deploy_command_spec.rb
 - spec/kontena/cli/app/docker_helper_spec.rb
+- spec/kontena/cli/app/scale_spec.rb
 - spec/kontena/cli/common_spec.rb
 - spec/kontena/cli/deploy_command_spec.rb
 - spec/kontena/cli/login_command_spec.rb
@@ -312,6 +321,7 @@ test_files:
 - spec/kontena/cli/app/common_spec.rb
 - spec/kontena/cli/app/deploy_command_spec.rb
 - spec/kontena/cli/app/docker_helper_spec.rb
+- spec/kontena/cli/app/scale_spec.rb
 - spec/kontena/cli/common_spec.rb
 - spec/kontena/cli/deploy_command_spec.rb
 - spec/kontena/cli/login_command_spec.rb