kontena-cli 1.3.5 → 1.4.0.pre1

data/lib/kontena/cli/nodes/ssh_command.rb

@@ -3,7 +3,7 @@ module Kontena::Cli::Nodes
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
 
-    parameter "[NODE_ID]", "SSH to Grid node. Use --any to connect to the first available node"
+    parameter "[NODE]", "SSH to Grid node. Use --any to connect to the first available node"
     parameter "[COMMANDS] ...", "Run command on host"
     option ["-a", "--any"], :flag, "Connect to first available node"
     option ["-i", "--identity-file"], "IDENTITY_FILE", "Path to ssh private key"
@@ -15,10 +15,10 @@ module Kontena::Cli::Nodes
     requires_current_grid
 
     def execute
-      exit_with_error "Cannot combine --any with a node name" if node_id && any?
+      exit_with_error "Cannot combine --any with a node name" if self.node && any?
 
-      if node_id
-        node = client.get("nodes/#{current_grid}/#{node_id}")
+      if self.node
+        node = client.get("nodes/#{current_grid}/#{self.node}")
       elsif any?
         nodes = client.get("grids/#{current_grid}/nodes")['nodes']
         node = nodes.select{ |node| node['connected'] }.first

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

@@ -3,18 +3,23 @@ module Kontena::Cli::Nodes
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
 
-    parameter "NODE_ID", "Node id"
+    requires_current_master
+    requires_current_master_token
+    requires_current_grid
+
+    parameter "NODE", "Node name"
+
     option ["-l", "--label"], "LABEL", "Node label", multivalued: true
+    option "--clear-labels", :flag, "Clear node labels"
 
     def execute
-      require_api_url
-      require_current_grid
-      token = require_token
-
       data = {}
-      data[:labels] = label_list if label_list
-      spinner "Updating #{node_id.colorize(:cyan)} node " do
-        client.put("nodes/#{current_grid}/#{node_id}", data)
+
+      data[:labels] = self.label_list unless self.label_list.empty?
+      data[:labels] = [] if self.clear_labels?
+
+      spinner "Updating #{self.node.colorize(:cyan)} node " do
+        client.put("nodes/#{current_grid}/#{self.node}", data)
       end
     end
   end

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

@@ -41,6 +41,8 @@ module Kontena::Cli::Services
     option "--health-check-initial-delay", "DELAY", "Initial delay for health check"
     option "--health-check-port", "PORT", "Port for health check"
     option "--health-check-protocol", "PROTOCOL", "Protocol of health check"
+    option "--stop-timeout", "STOP_TIMEOUT", "Timeout (duration) to stop a container"
+    option "--read-only", :flag, "Read-only root fs for the container", default: false
 
     def execute
       require_api_url
@@ -87,6 +89,8 @@ module Kontena::Cli::Services
       health_check = parse_health_check
       data[:health_check] = health_check unless health_check.empty?
       data[:pid] = pid if pid
+      data[:stop_grace_period] = stop_timeout if stop_timeout
+      data[:read_only] = read_only?
       data
     end
   end

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

@@ -52,6 +52,8 @@ module Kontena
           puts "  stateful: #{service['stateful'] == true ? 'yes' : 'no' }"
           puts "  scaling: #{service['instances'] }"
           puts "  strategy: #{service['strategy']}"
+          puts "  read_only: #{service['read_only'] == true ? 'yes' : 'no'}"
+          puts "  stop_grace_period: #{service['stop_grace_period']}s"
           puts "  deploy_opts:"
           if service['deploy_opts']['min_health']
             puts "    min_health: #{service['deploy_opts']['min_health']}"

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

@@ -38,6 +38,7 @@ module Kontena::Cli::Services
     option "--health-check-initial-delay", "DELAY", "Initial for HTTP health check"
     option "--health-check-port", "PORT", "Port for HTTP health check"
     option "--health-check-protocol", "PROTOCOL", "Protocol of health check"
+    option "--stop-timeout", "STOP_TIMEOUT", "Timeout (duration) to stop a container"
 
     def execute
       require_api_url
@@ -78,6 +79,7 @@ module Kontena::Cli::Services
       health_check = parse_health_check
       data[:health_check] = health_check unless health_check.empty?
       data[:pid] = pid if pid
+      data[:stop_grace_period] = stop_timeout if stop_timeout
       data
     end
   end

data/lib/kontena/cli/stacks/service_generator.rb

@@ -63,6 +63,8 @@ module Kontena::Cli::Stacks
       data['secrets'] = options['secrets'] if options['secrets']
       data['build'] = parse_build_options(options) if options['build']
       data['health_check'] = parse_health_check(options)
+      data['stop_grace_period'] = options['stop_grace_period'] if options['stop_grace_period']
+      data['read_only'] = options['read_only'] || false
       data
     end
 

data/lib/kontena/cli/stacks/show_command.rb

@@ -57,6 +57,7 @@ module Kontena::Cli::Stacks
       puts "#{pad}  stateful: #{service['stateful'] == true ? 'yes' : 'no' }"
       puts "#{pad}  scaling: #{service['instances'] }"
       puts "#{pad}  strategy: #{service['strategy']}"
+      puts "#{pad}  read_only: #{service['read_only'] == true ? 'yes' : 'no'}"
       puts "#{pad}  deploy_opts:"
       puts "#{pad}    min_health: #{service['deploy_opts']['min_health']}"
       if service['deploy_opts']['wait_for_port']

data/lib/kontena/cli/stacks/stacks_helper.rb

@@ -4,10 +4,9 @@ module Kontena::Cli::Stacks
     def wait_for_deployment_to_start(deployment, timeout = 600)
       started = false
       Timeout::timeout(timeout) do
-        until started
-          deployment = client.get("stacks/#{deployment['stack_id']}/deploys/#{deployment['id']}")
-          started = true if deployment['service_deploys'].size > 0
+        while deployment['state'] == 'created'
           sleep 1
+          deployment = client.get("stacks/#{deployment['stack_id']}/deploys/#{deployment['id']}")
         end
         if deployment['state'] == 'error'
           deployment['service_deploys'].each do |service_deploy|

data/lib/kontena/cli/stacks/yaml/validations.rb

@@ -74,7 +74,9 @@ module Kontena::Cli::Stacks::YAML
           'timeout' => optional('integer'),
           'interval' => optional('integer'),
           'initial_delay' => optional('integer')
-        })
+        }),
+        'stop_grace_period' => optional(/(\d+(?:\.\d+)?)([hms])/),
+        'read_only' => optional('boolean')
       }
     end
 

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

@@ -19,10 +19,23 @@ write_files:
       fs.inotify.max_user_instances = 8192
 coreos:
   units:
-    - name: 50-docker.network
-      mask: true
-    - name: 50-docker-veth.network
-      mask: true
+    - name: 50-weave.network
+      content: |
+        [Match]
+        Name=weave datapath vxlan-6784
+
+        [Network]
+        Description=Network interfaces managed by weave
+
+        [Link]
+        Unmanaged=true
+    - name: 90-dummy.network
+      content: |
+        [Match]
+        Name=dummy0
+
+        [Link]
+        Unmanaged=true
     - name: zz-default.network
       content: |
         # default should not match virtual Docker/weave bridge/veth network interfaces

data/omnibus/package-scripts/kontena/postinst

@@ -12,11 +12,7 @@ error_exit()
   exit 1
 }
 
-chown $USER /opt/kontena/embedded/bin
-chown $USER -R /opt/kontena/embedded/lib/ruby/gems/2.1.0
 mkdir -p /usr/local/bin
 ln -s /opt/kontena/bin/kontena /usr/local/bin/kontena
 
-echo "Thank you for installing Kontena!"
-
 exit 0

data/omnibus/package-scripts/kontena/postrm

@@ -4,6 +4,6 @@
 # after package is uninstalled.
 #
 
-echo "Kontena has been uninstalled!"
+[ -L /usr/local/bin/kontena ] && rm /usr/local/bin/kontena
 
 exit 0

data/omnibus/package-scripts/kontena/preinst

@@ -3,5 +3,3 @@
 # Perform necessary kontena setup steps
 # before package is installed.
 #
-
-echo "You're about to install Kontena!"

data/spec/fixtures/api/node.json

@@ -0,0 +1,93 @@
+{
+   "initial_member" : true,
+   "peer_ips" : [
+      "192.168.66.102"
+   ],
+   "last_seen_at" : "2017-07-04T08:36:02.280Z",
+   "updated_at" : "2017-07-04T08:35:09.455Z",
+   "node_number" : 1,
+   "volume_drivers" : [
+      {
+         "version" : null,
+         "name" : "local"
+      }
+   ],
+   "resource_usage" : {
+      "memory" : {
+         "free" : 194068480,
+         "inactive" : 225415168,
+         "buffers" : 37978112,
+         "cached" : 390828032,
+         "total" : 1045561344,
+         "used" : 851492864,
+         "active" : 521949184
+      },
+      "cpu" : null,
+      "usage" : null,
+      "load" : {
+         "5m" : 0.33642578125,
+         "1m" : 1.48779296875,
+         "15m" : 0.10888671875
+      },
+      "filesystem" : [
+         {
+            "total" : 16718393344,
+            "used" : 3104915456,
+            "name" : "/var/lib/docker",
+            "free" : 13613477888,
+            "available" : 12730281984
+         }
+      ]
+   },
+   "overlay_ip" : "10.81.0.1",
+   "labels" : [
+      "test"
+   ],
+   "engine_root_dir" : "/var/lib/docker",
+   "cpus" : 1,
+   "os" : "Container Linux by CoreOS 1409.5.0 (Ladybug)",
+   "public_ip" : "91.150.10.190",
+   "kernel_version" : "4.11.6-coreos-r1",
+   "node_id" : "XI4K:NPOL:EQJ4:S4V7:EN3B:DHC5:KZJD:F3U2:PCAN:46EV:IO4A:63S5",
+   "created_at" : "2016-10-27T08:15:31.084Z",
+   "id" : "development/core-01",
+   "name" : "core-01",
+   "network_drivers" : [
+      {
+         "version" : null,
+         "name" : "bridge"
+      },
+      {
+         "version" : null,
+         "name" : "host"
+      },
+      {
+         "version" : null,
+         "name" : "overlay"
+      },
+      {
+         "name" : "null",
+         "version" : null
+      }
+   ],
+   "driver" : "overlay",
+   "mem_limit" : 0,
+   "docker_version" : "1.12.6",
+   "agent_version" : "1.4.0.dev",
+   "private_ip" : "192.168.66.101",
+   "connected_at" : "2017-07-04T08:36:02.235Z",
+   "grid" : {
+      "supernet" : "10.80.0.0/12",
+      "trusted_subnets" : [],
+      "stats" : {
+         "statsd" : null
+      },
+      "token" : "tBsoco4sBClMtIOD/bHeIqS1KYM0kZMG7B960jNWWQXMOxqhOf8W1QgiNJlW9u6B/qS+rfS2ZLpC/ZJsyPNj0A==",
+      "id" : "development",
+      "name" : "development",
+      "subnet" : "10.81.0.0/16",
+      "initial_size" : 1
+   },
+   "mem_total" : 1045032960,
+   "connected" : true
+}

data/spec/kontena/cli/containers/logs_command_spec.rb

@@ -27,10 +27,6 @@ describe Kontena::Cli::Containers::LogsCommand do
       ]
     end
 
-    before(:each) do
-      Kontena.pastel.resolver.color.disable!
-    end
-
     it "shows all logs" do
       allow(client).to receive(:get).with('containers/test-grid/node-1/test-mysql-1/logs', {
         limit: 100,

data/spec/kontena/cli/etcd/health_command_spec.rb

@@ -8,82 +8,147 @@ describe Kontena::Cli::Etcd::HealthCommand do
     allow(subject).to receive(:health_icon) {|health| health.inspect }
   end
 
-  describe '#show_node_health' do
-    context "For an offline node" do
-      let :node_health do
-        {
-          "connected" => false,
-          "name" => "node-1",
-          'etcd_health' => {
-            'health' => nil,
-            'error' => nil,
-          },
-        }
-      end
+  let :node1_health do
+    {
+      "id" => 'test-grid/node-1',
+      "connected" => false,
+      "name" => "node-1",
+      'etcd_health' => {
+        'health' => nil,
+        'error' => nil,
+      },
+    }
+  end
+  let :node2_health do
+    {
+      "id" => 'test-grid/node-2',
+      "name" => "node-2",
+      "connected" => true,
+      'etcd_health' => {
+        'health' => nil,
+        'error' => "timeout",
+      },
+    }
+  end
+  let :node3_health do
+    {
+      "id" => 'test-grid/node-3',
+      "name" => "node-3",
+      "connected" => true,
+      'etcd_health' => {
+        'health' => false,
+        'error' => nil,
+      },
+    }
+  end
+  let :node4_health do
+    {
+      "id" => 'test-grid/node-4',
+      "name" => "node-4",
+      "connected" => true,
+      'etcd_health' => {
+        'health' => true,
+        'error' => nil,
+      },
+    }
+  end
 
-      it "shows offline and returns false" do
-        expect{subject.show_node_health(node_health)}.to return_and_output false, [
-          ":offline Node node-1 is offline",
-        ]
-      end
+  before do
+    allow(client).to receive(:get).with('nodes/test-grid/node-1/health').and_return(node1_health)
+    allow(client).to receive(:get).with('nodes/test-grid/node-2/health').and_return(node2_health)
+    allow(client).to receive(:get).with('nodes/test-grid/node-3/health').and_return(node3_health)
+    allow(client).to receive(:get).with('nodes/test-grid/node-4/health').and_return(node4_health)
+  end
+
+  context "For an offline node-1" do
+    it "shows offline and returns false" do
+      expect{subject.run(['node-1'])}.to exit_with_error.and output_lines [
+        ":offline Node node-1 is offline",
+      ]
     end
+  end
 
-    context "For a node with health errors" do
-      let :node_health do
-        {
-          "name" => "node-1",
-          "connected" => true,
-          'etcd_health' => {
-            'health' => nil,
-            'error' => "timeout",
-          },
-        }
-      end
+  context "For a node-2 with health errors" do
+    it "shows errored and returns false" do
+      expect{subject.run(['node-2'])}.to exit_with_error.and output_lines [
+        ":error Node node-2 is unhealthy: timeout",
+      ]
+    end
+  end
+
+  context "For a node-3 that returns health=false" do
+    it "shows unhealthy and returns false" do
+      expect{subject.run(['node-3'])}.to exit_with_error.and output_lines [
+        ":error Node node-3 is unhealthy",
+      ]
+    end
+  end
 
-      it "shows errored and returns false" do
-        expect{subject.show_node_health(node_health)}.to return_and_output false, [
-          ":error Node node-1 is unhealthy: timeout",
-        ]
-      end
+  context "For a healthy node-4" do
+    it "shows healthy and returns true" do
+      expect{subject.run(['node-4'])}.to output_lines [
+        ":ok Node node-4 is healthy",
+      ]
     end
+  end
 
-    context "For a node that returns health=false" do
-      let :node_health do
+  context "For a grid of mixed nodes" do
+    let :grid_nodes do
+      [
+        {
+          'id' => 'test-grid/node-1',
+        },
         {
-          "name" => "node-1",
-          "connected" => true,
-          'etcd_health' => {
-            'health' => false,
-            'error' => nil,
-          },
-        }
-      end
+          'id' => 'test-grid/node-2',
+        },
+        {
+          'id' => 'test-grid/node-3',
+        },
+        {
+          'id' => 'test-grid/node-4',
+        },
+      ]
+    end
 
-      it "shows unhealthy and returns false" do
-        expect{subject.show_node_health(node_health)}.to return_and_output false, [
-          ":error Node node-1 is unhealthy",
-        ]
-      end
+    before do
+      allow(client).to receive(:get).with('grids/test-grid/nodes').and_return(
+        'nodes' => grid_nodes,
+      )
     end
 
-    context "For a healthy node" do
-      let :node_health do
+    it 'shows all nodes and exits with an error' do
+      expect{subject.run([])}.to exit_with_error.and output_lines [
+        ":offline Node node-1 is offline",
+        ":error Node node-2 is unhealthy: timeout",
+        ":error Node node-3 is unhealthy",
+        ":ok Node node-4 is healthy",
+      ]
+    end
+  end
+
+  context 'for a grid with healthy nodes' do
+    let :grid_nodes do
+      [
         {
-          "name" => "node-1",
-          "connected" => true,
-          'etcd_health' => {
-            'health' => true,
-            'error' => nil,
-          },
-        }
-      end
+          'id' => 'test-grid/node-4',
+        },
+        {
+          'id' => 'test-grid/node-4',
+        },
+      ]
+    end
 
+    before do
+      allow(client).to receive(:get).with('grids/test-grid/nodes').and_return(
+        'nodes' => grid_nodes,
+      )
+    end
 
-      it "shows healthy and returns true" do
-        expect{subject.show_node_health(node_health)}.to return_and_output true, [
-          ":ok Node node-1 is healthy",
-        ]
-      end
+    it 'shows nodes as healthy anddoes not and exit with an error' do
+      expect{subject.run([])}.to output_lines [
+        ":ok Node node-4 is healthy",
+        ":ok Node node-4 is healthy",
+      ]
     end
   end
 end