kontena-cli 0.8.4 → 0.9.0

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

@@ -0,0 +1,15 @@
+require_relative 'azure/create_command'
+require_relative 'azure/restart_command'
+require_relative 'azure/terminate_command'
+
+module Kontena::Cli::Nodes
+  class AzureCommand < Clamp::Command
+
+    subcommand "create", "Create a new Azure node", Azure::CreateCommand
+    subcommand "restart", "Restart Azure node", Azure::RestartCommand
+    subcommand "terminate", "Terminate Azure node", Azure::TerminateCommand
+
+    def execute
+    end
+  end
+end

data/lib/kontena/cli/nodes/digital_ocean/create_command.rb

@@ -2,7 +2,7 @@ module Kontena::Cli::Nodes::DigitalOcean
   class CreateCommand < Clamp::Command
     include Kontena::Cli::Common
 
-    option "--name", "NAME", "Node name"
+    parameter "[NAME]", "Node name"
     option "--token", "TOKEN", "DigitalOcean API token", required: true
     option "--ssh-key", "SSH_KEY", "Path to ssh public key", required: true
     option "--size", "SIZE", "Droplet size", default: '1gb'

data/lib/kontena/cli/nodes/vagrant/create_command.rb

@@ -2,7 +2,7 @@ module Kontena::Cli::Nodes::Vagrant
   class CreateCommand < Clamp::Command
     include Kontena::Cli::Common
 
-    option "--name", "NAME", "Node name"
+    parameter "[NAME]", "Node name"
     option "--memory", "MEMORY", "How much memory node has", default: '1024'
     option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
 

data/lib/kontena/cli/service_command.rb

@@ -11,6 +11,8 @@ require_relative 'services/delete_command'
 require_relative 'services/containers_command'
 require_relative 'services/logs_command'
 require_relative 'services/stats_command'
+require_relative 'services/add_env_command'
+require_relative 'services/remove_env_command'
 
 class Kontena::Cli::ServiceCommand < Clamp::Command
 
@@ -27,6 +29,8 @@ class Kontena::Cli::ServiceCommand < Clamp::Command
   subcommand "containers", "List service containers", Kontena::Cli::Services::ContainersCommand
   subcommand "logs", "Show service logs", Kontena::Cli::Services::LogsCommand
   subcommand "stats", "Show service statistics", Kontena::Cli::Services::StatsCommand
+  subcommand "add-env", "Add environment variable", Kontena::Cli::Services::AddEnvCommand
+  subcommand "remove-env", "Remove environment variable", Kontena::Cli::Services::RemoveEnvCommand
 
   def execute
   end

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

@@ -0,0 +1,18 @@
+require_relative 'services_helper'
+
+module Kontena::Cli::Services
+  class AddEnvCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include ServicesHelper
+
+    parameter "NAME", "Service name"
+    parameter "ENV", "Environment variable"
+
+    def execute
+      require_api_url
+      token = require_token
+      data = {env: env}
+      result = client(token).post("services/#{parse_service_id(name)}/envs", data)
+    end
+  end
+end

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

@@ -21,8 +21,12 @@ module Kontena::Cli::Services
     option "--instances", "INSTANCES", "How many instances should be deployed"
     option ["-u", "--user"], "USER", "Username who executes first process inside container"
     option "--stateful", :flag, "Set service as stateful", default: false
+    option "--privileged", :flag, "Give extended privileges to this service", default: false
     option "--cap-add", "CAP_ADD", "Add capabitilies", multivalued: true
     option "--cap-drop", "CAP_DROP", "Drop capabitilies", multivalued: true
+    option "--net", "NET", "Network mode"
+    option "--log-driver", "LOG_DRIVER", "Set logging driver"
+    option "--log-opt", "LOG_OPT", "Add logging options", multivalued: true
 
     def execute
       require_api_url
@@ -54,8 +58,12 @@ module Kontena::Cli::Services
       data[:cmd] = cmd.split(" ") if cmd
       data[:user] = user if user
       data[:image] = parse_image(image) if image
+      data[:privileged] = privileged?
       data[:cap_add] = cap_add_list unless cap_add_list.empty?
       data[:cap_drop] = cap_drop_list unless cap_drop_list.empty?
+      data[:net] = net if net
+      data[:log_driver] = log_driver if log_driver
+      data[:log_opts] = parse_log_opts(log_opt_list)
       data
     end
   end

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

@@ -0,0 +1,17 @@
+require_relative 'services_helper'
+
+module Kontena::Cli::Services
+  class RemoveEnvCommand < Clamp::Command
+    include Kontena::Cli::Common
+    include ServicesHelper
+
+    parameter "NAME", "Service name"
+    parameter "ENV", "Environment variable name"
+
+    def execute
+      require_api_url
+      token = require_token
+      client(token).delete("services/#{parse_service_id(name)}/envs/#{env}")
+    end
+  end
+end

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

@@ -85,6 +85,13 @@ module Kontena
             puts "    - #{c}"
           end
 
+          puts "  log_driver: #{service['log_driver']}"
+
+          puts "  log_opts:"
+          service['log_opts'].each do |opt, value|
+            puts "    #{opt}: #{value}"
+          end
+
           puts "  containers:"
           result = client(token).get("services/#{parse_service_id(service_id)}/containers")
           result['containers'].each do |container|
@@ -113,7 +120,7 @@ module Kontena
             print '.'
             sleep 1
           end
-          puts ' done'
+          puts ' done'.colorize(:green)
           puts ''
         end
 
@@ -202,6 +209,18 @@ module Kontena
           end
           image
         end
+
+        ##
+        # @param [Array] log_opts
+        # @return [Hash]
+        def parse_log_opts(log_opts)
+          opts = {}
+          log_opts.each do |opt|
+            key, value = opt.split('=')
+            opts[key] = value
+          end
+          opts
+        end
       end
     end
   end

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

@@ -10,6 +10,7 @@ module Kontena::Cli::Services
     option "--image", "IMAGE", "Docker image to use"
     option ["-p", "--ports"], "PORTS", "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
     option ["-c", "--cpu-shares"], "CPU_SHARES", "CPU shares (relative weight)"
     option ["-m", "--memory"], "MEMORY", "Memory limit (format: <number><optional unit>, where unit = b, k, m or g)"
@@ -17,8 +18,12 @@ module Kontena::Cli::Services
     option "--cmd", "CMD", "Command to execute"
     option "--instances", "INSTANCES", "How many instances should be deployed"
     option ["-u", "--user"], "USER", "Username who executes first process inside container"
+    option "--privileged", :flag, "Give extended privileges to this service", default: false
     option "--cap-add", "CAP_ADD", "Add capabitilies", multivalued: true
     option "--cap-drop", "CAP_DROP", "Drop capabitilies", multivalued: true
+    option "--net", "NET", "Network mode"
+    option "--log-driver", "LOG_DRIVER", "Set logging driver"
+    option "--log-opt", "LOG_OPT", "Add logging options", multivalued: true
 
     def execute
       require_api_url
@@ -34,6 +39,7 @@ module Kontena::Cli::Services
     def parse_service_data_from_options
       data = {}
       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
       data[:memory_swap] = parse_memory(memory_swap) if memory_swap
       data[:cpu_shares] = cpu_shares if cpu_shares
@@ -43,8 +49,12 @@ module Kontena::Cli::Services
       data[:cmd] = cmd.split(" ") if cmd
       data[:user] = user if user
       data[:image] = parse_image(image) if image
+      data[:privileged] = privileged?
       data[:cap_add] = cap_add_list unless cap_add_list.empty?
       data[:cap_drop] = cap_drop_list unless cap_drop_list.empty?
+      data[:net] = net if net
+      data[:log_driver] = log_driver if log_driver
+      data[:log_opts] = parse_log_opts(log_opt_list)
       data
     end
   end

data/lib/kontena/client.rb

@@ -24,9 +24,14 @@ module Kontena
     #
     # @param [String] path
     # @param [Hash,NilClass] params
+    # @param [Hash] headers
     # @return [Hash]
     def get(path, params = nil, headers = {})
-      response = http_client.get(path: request_uri(path), query: params, headers: request_headers(headers))
+      response = http_client.get(
+        path: request_uri(path),
+        query: params,
+        headers: request_headers(headers)
+      )
       if response.status == 200
         parse_response(response)
       else
@@ -34,6 +39,22 @@ module Kontena
       end
     end
 
+    # Get request
+    #
+    # @param [String] path
+    # @param [Lambda] response_block
+    # @param [Hash,NilClass] params
+    # @param [Hash] headers
+    def get_stream(path, response_block, params = nil, headers = {})
+      http_client.get(
+        read_timeout: 360,
+        path: request_uri(path),
+        query: params,
+        headers: request_headers(headers),
+        response_block: response_block
+      )
+    end
+
     # Post request
     #
     # @param [String] path

data/lib/kontena/machine/aws.rb

@@ -0,0 +1,13 @@
+begin
+  require "fog/aws"
+rescue LoadError
+  puts "It seems that you don't have gem for AWS API installed."
+  puts "Install it using: gem install fog-aws"
+  exit 1
+end
+
+require_relative 'random_name'
+require_relative 'aws/master_provisioner'
+require_relative 'aws/node_provisioner'
+require_relative 'aws/node_destroyer'
+

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

@@ -0,0 +1,66 @@
+#cloud-config
+hostname: <%= name %>
+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-kontena.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=<%= dns_server %>
+        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/aws/cloudinit_master.yml

@@ -0,0 +1,105 @@
+#cloud-config
+write_files:
+  - path: /etc/kontena-server.env
+    permissions: 0600
+    owner: root
+    content: |
+      KONTENA_VERSION=<%= version %>
+      <% if ssl_cert %>SSL_CERT="/etc/kontena-server.pem"
+
+  - path: /etc/kontena-server.pem
+    permissions: 0600
+    owner: root
+    content: | <% ssl_cert.split(/\n/).each do |row| %>
+      <%= row %><% end %><% end %>
+  - path: /opt/bin/kontena-haproxy.sh
+    permissions: 0755
+    owner: root
+    content: |
+      #!/bin/sh
+      if [ -n "$SSL_CERT" ]; then
+        SSL_CERT=$(awk 1 ORS='\\n' $SSL_CERT)
+      else
+        SSL_CERT="**None**"
+      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 \
+        -p 80:80 -p 443:443 kontena/haproxy:latest
+coreos:
+  update:
+      reboot-strategy: off
+  units:
+    - name: kontena-server-mongo.service
+      command: start
+      enable: true
+      content: |
+        [Unit]
+        Description=kontena-server-mongo
+        After=network-online.target
+        After=docker.service
+        Description=Kontena Server MongoDB
+        Documentation=http://www.mongodb.org/
+        Requires=network-online.target
+        Requires=docker.service
+
+        [Service]
+        Restart=always
+        RestartSec=5
+        ExecStartPre=/usr/bin/docker pull mongo:3.0
+        ExecStartPre=-/usr/bin/docker create --name=kontena-server-mongo-data mongo:3.0
+        ExecStartPre=-/usr/bin/docker stop kontena-server-mongo
+        ExecStartPre=-/usr/bin/docker rm kontena-server-mongo
+        ExecStart=/usr/bin/docker run --name=kontena-server-mongo \
+            --volumes-from=kontena-server-mongo-data \
+            mongo:3.0 mongod --smallfiles
+
+    - name: kontena-server-api.service
+      command: start
+      enable: true
+      content: |
+        [Unit]
+        Description=kontena-server-api
+        After=network-online.target
+        After=docker.service
+        After=kontena-server-mongo.service
+        Description=Kontena Master
+        Documentation=http://www.kontena.io/
+        Requires=network-online.target
+        Requires=docker.service
+        Requires=kontena-server-mongo.service
+
+        [Service]
+        Restart=always
+        RestartSec=5
+        EnvironmentFile=/etc/kontena-server.env
+        ExecStartPre=-/usr/bin/docker stop kontena-server-api
+        ExecStartPre=-/usr/bin/docker rm kontena-server-api
+        ExecStartPre=/usr/bin/docker pull kontena/server:${KONTENA_VERSION}
+        ExecStart=/usr/bin/docker run --name kontena-server-api \
+            --link kontena-server-mongo:mongodb \
+            -e MONGODB_URI=mongodb://mongodb:27017/kontena_server \
+            <% if auth_server %>-e AUTH_API_URL=<%= auth_server %><% end %> \
+            kontena/server:${KONTENA_VERSION}
+
+    - name: kontena-server-haproxy.service
+      command: start
+      enable: true
+      content: |
+        [Unit]
+        Description=kontena-server-haproxy
+        After=network-online.target
+        After=docker.service
+        Description=Kontena Server HAProxy
+        Documentation=http://www.kontena.io/
+        Requires=network-online.target
+        Requires=docker.service
+
+        [Service]
+        Restart=always
+        RestartSec=5
+        EnvironmentFile=/etc/kontena-server.env
+        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

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

@@ -0,0 +1,161 @@
+require 'fileutils'
+require 'erb'
+require 'open3'
+require 'shell-spinner'
+
+module Kontena
+  module Machine
+    module Aws
+      class MasterProvisioner
+        include RandomName
+        attr_reader :client, :http_client, :region
+
+        # @param [String] access_key_id aws_access_key_id
+        # @param [String] secret_key aws_secret_access_key
+        # @param [String] region
+        def initialize(access_key_id, secret_key, region)
+          @client = Fog::Compute.new(:provider => 'AWS', :aws_access_key_id => access_key_id, :aws_secret_access_key => secret_key, :region => region)
+
+        end
+
+        # @param [Hash] opts
+        def run!(opts)
+          if opts[:ssl_cert]
+            abort('Invalid ssl cert') unless File.exists?(File.expand_path(opts[:ssl_cert]))
+            ssl_cert = File.read(File.expand_path(opts[:ssl_cert]))
+          end
+
+          ami = resolve_ami(client.region)
+          abort('No valid AMI found for region') unless ami
+          opts[:vpc] = default_vpc.id unless opts[:vpc]
+          if opts[:subnet].nil?
+            subnet = default_subnet(opts[:vpc], client.region+opts[:zone])
+            opts[:subnet] = subnet.subnet_id
+          else
+            subnet = client.subnets.get(opts[:subnet])
+          end
+          userdata_vars = {
+              ssl_cert: ssl_cert,
+              auth_server: opts[:auth_server],
+              version: opts[:version]
+          }
+
+          security_group = ensure_security_group(opts[:vpc])
+          name = generate_name
+          response = client.run_instances(
+              ami,
+              1,
+              1,
+              'InstanceType'  => opts[:type],
+              'SecurityGroupId' => security_group.group_id,
+              'KeyName'       => opts[:key_pair],
+              'SubnetId'      => opts[:subnet],
+              'UserData'      => user_data(userdata_vars),
+              'BlockDeviceMapping' => [
+                  {
+                      'DeviceName' => '/dev/xvda',
+                      'VirtualName' => 'Root',
+                      'Ebs.VolumeSize' => opts[:storage],
+                      'Ebs.VolumeType' => 'gp2'
+                  }
+              ]
+
+          )
+          instance_id = response.body['instancesSet'].first['instanceId']
+
+          instance = client.servers.get(instance_id)
+          ShellSpinner "Creating AWS instance #{name.colorize(:cyan)} " do
+            instance.wait_for { ready? }
+          end
+          if opts[:ssl_cert]
+            master_url = "https://#{instance.public_ip_address}"
+          else
+            master_url = "http://#{instance.public_ip_address}"
+          end
+          Excon.defaults[:ssl_verify_peer] = false
+          @http_client = Excon.new("#{master_url}", :connect_timeout => 10)
+
+          ShellSpinner "Waiting for #{name.colorize(:cyan)} to start" do
+            sleep 5 until master_running?
+          end
+
+          puts "Kontena Master is now running at #{master_url}"
+          puts "Use #{"kontena login #{master_url}".colorize(:light_black)} to complete Kontena Master setup"
+        end
+
+        ##
+        # @param [String] grid
+        # @return Fog::Compute::AWS::SecurityGroup
+        def ensure_security_group(vpc_id)
+          group_name = "kontena_master"
+          if vpc_id
+            client.security_groups.all({'group-name' => group_name, 'vpc-id' => vpc_id}).first || create_security_group(group_name, vpc_id)
+          else
+            client.security_groups.get(group_name) || create_security_group(group_name)
+          end
+        end
+
+        ##
+        # creates security_group and authorizes default port ranges
+        #
+        # @param [String] name
+        # @return Fog::Compute::AWS::SecurityGroup
+        def create_security_group(name, vpc_id = nil)
+          security_group = client.security_groups.new(:name => name, :description => "Kontena Master", :vpc_id => vpc_id)
+          security_group.save
+
+          security_group.authorize_port_range(80..80)
+          security_group.authorize_port_range(443..443)
+          security_group.authorize_port_range(22..22)
+          security_group
+        end
+
+        # @param [String] region
+        # @return String
+        def resolve_ami(region)
+          images = {
+              'eu-central-1' => 'ami-74bbba69',
+              'ap-northeast-1' => 'ami-1e77ff1e',
+              'us-gov-west-1' => 'ami-f1d1b2d2',
+              'sa-east-1' => 'ami-632ba17e',
+              'ap-southeast-2' => 'ami-83f8b4b9',
+              'ap-southeast-1' => 'ami-12060c40',
+              'us-east-1' => 'ami-f396fa96',
+              'us-west-2' => 'ami-99bfada9',
+              'us-west-1' => 'ami-dbe71d9f',
+              'eu-west-1' => 'ami-83e9c8f4'
+          }
+          images[region]
+        end
+
+
+        def default_subnet(vpc, zone)
+          client.subnets.all('vpc-id' => vpc, 'availabilityZone' => zone).first
+        end
+
+        def default_vpc
+          client.vpcs.all('isDefault' => true).first
+        end
+
+        def user_data(vars)
+          cloudinit_template = File.join(__dir__ , '/cloudinit_master.yml')
+          erb(File.read(cloudinit_template), vars)
+        end
+
+        def generate_name
+          "kontena-master-#{super}-#{rand(1..99)}"
+        end
+
+        def master_running?
+          http_client.get(path: '/').status == 200
+        rescue
+          false
+        end
+
+        def erb(template, vars)
+          ERB.new(template).result(OpenStruct.new(vars).instance_eval { binding })
+        end
+      end
+    end
+  end
+end