kontena-plugin-upcloud 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e47dc978aaba2e0fa7b92c722e42c877bfea8dd
-  data.tar.gz: ca0d47f5807a4b43cf73d060928db67dee651ef4
+  metadata.gz: 2c4c7355ad5cb678eae3164eab3d4e7a431737b0
+  data.tar.gz: f2cacd22c569d7f9c71ea3dbfa10d54d385dc36a
 SHA512:
-  metadata.gz: fae8d0e61d3b92cdc9127bdb0c5e072bed6919cbe648fd62efb3070c6b2ccce9d033b23202d425ecedb19c49be62b0a5962eaef526add7b3cd890fc1d5f717d4
-  data.tar.gz: e8978798fcb8ead2e3a48f20a8248eba3f0a7d3acc09bf52fe572745cf35fb532b380df86dee85fdcba291f7cac77f6b390018b6952fa6241aea56c4e4e9cc7a
+  metadata.gz: 6ab242dc67aa75f27f53bae70f0c2cd1ccebc5d139e286ffdb725950a074982b6c45fef817d33f7cd6e21abb030595971f45461d2c57785732ffe2777f73ef84
+  data.tar.gz: 7ea9fb517948d7225fe869a542fcc0e7b742f1695f1147cb3846784c780384d6bf1318e17e8bb25bbf1c6cf0e0c15ee5938bac92a10279e22ede1a70d7b83138

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 rvm:
-  - 2.0.0-p648
-  - 2.1.8
-  - 2.2.3
-  - 2.3.1
+  - 2.1.10
+  - 2.2.6
+  - 2.3.3
+  - 2.4.1
 env:
   - secure: "SWp7F0Gu07m6DYXYNMTL746xXsS1oGmv68XSf/6Af/gdEEPLfllJ0hsHK7D0tiXvtvUFlQ+zQr7WVSYavvdkoaPjTAICD3pL5U7yMla4v6MQl4Mohwr2LwUx9YC18Ij6HIjSsk2EUSqxTyANOqxcRi820nZZUtZeGpUsP0aO/yCyBQOQdLSGOVHi7oUMrKfCjjl9vjrKAOHvsvlM4XvB4EzRM2m2hoxkQBOFWVGRbZXWQUzMuLW1kh1WIScul2ObFWFMz8zBFkizIiEHktwlaqWst66w1464WRv/JcvUrEombyvvoJbeeByguhoa3Y614t1ESYDKH65oUVNQUhlAr1+iUqUJvdulIh2WAuyer3rHytEdXVfs8kbPLcVhqToPTUAV4mzJ1jFWttguDHUh5R4Y6UTw9jVbh+d7lfuE4y3ghwTvciCCdkYTHRHJIzDkOW6pKpOxW0cDaX3J/7Gh8lJ7asLsP16uqbrC3W0gpFBWmMnielDfXzWkrfPlZtR8N75SyHgw/fPHfcqvw1IadrZ8tsyAIHj7afdIhcBrd86UCvGW7feF0RUYlXevxs2aesAnujpJatTp23fCUBsbJywI7DmvuvWLwbTBumI1mEvyAbQh+lIy2oqeK1/3lUtmDkWey21fRt06hippKf40DiAXK4Gzn0HuYkQotc9GHeo="
 cache: bundler
@@ -13,4 +13,5 @@ deploy:
   api_key: $GEM_TOKEN
   gem: kontena-plugin-upcloud
   on:
-    tags: true
+    tags: true
+    rvm: 2.4.1

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

@@ -27,10 +27,25 @@ write_files:
       nameserver 8.8.4.4
 coreos:
   units:
+    - name: update-on-boot.service
+      command: start
+      enable: true
+      content: |
+        [Unit]
+        Description=Trigger OS update on boot
+        After=update_engine.service
+        ConditionPathExists=!/etc/update-on-boot.lock
+        [Service]
+        Type=oneshot
+        TimeoutStartSec=0
+        ExecStart=/usr/bin/update_engine_client -update
+        ExecStart=/bin/touch /etc/update-on-boot.lock
+        ExecStartPost=/usr/sbin/reboot
     - name: etcd2.service
       command: start
       enable: true
       content: |
+        [Unit]
         Description=etcd 2.0
         After=docker.service
         [Service]
@@ -82,3 +97,4 @@ coreos:
             -v=/etc/kontena-agent.env:/etc/kontena.env \
             --net=host \
             kontena/agent:${KONTENA_VERSION}
+        ExecStop=/usr/bin/docker stop kontena-agent

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

@@ -50,7 +50,7 @@ module Kontena
             server_name = hostname.sub('kontena-master-', '')
           end
 
-          server_name = opts[:name] 
+          server_name = opts[:name]
           hostname = opts[:name] || generate_name
 
           userdata_vars = opts.merge(
@@ -61,7 +61,7 @@ module Kontena
           device_data = {
             server: {
               zone: opts[:zone],
-              title: "Kontena Master #{server_name}",
+              title: server_name,
               hostname: hostname,
               plan: plan[:name],
               vnc: 'off',

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

@@ -26,19 +26,19 @@ module Kontena
           end
 
           server = servers[:servers][:server].find{|s| s[:hostname] == name}
-            
-          abort "Cannot find node #{name.colorize(:cyan)} in Upcloud" unless server
+
+          abort "Cannot find node #{name.colorize(:cyan)} in UpCloud" unless server
 
           server_data = get("server/#{server[:uuid]}")
 
           storage_devices = server_data.fetch(:server, {}).fetch(:storage_devices, {}).fetch(:storage_device, [])
           storage_uuids = storage_devices.map{|s| s[:storage]}
 
-          abort('No storage devices found for Upcloud node') if storage_uuids.empty?
+          abort('No storage devices found for UpCloud node') if storage_uuids.empty?
 
           if server
             unless server[:state].eql?('stopped')
-              spinner "Shutting down Upcloud node #{name.colorize(:cyan)} " do
+              spinner "Shutting down UpCloud node #{name.colorize(:cyan)} " do
                 device_data = post(
                   "server/#{server[:uuid]}/stop", body: {
                     stop_server: {
@@ -55,26 +55,26 @@ module Kontena
               end
             end
 
-            spinner "Terminating Upcloud node #{name.colorize(:cyan)} " do
+            spinner "Terminating UpCloud node #{name.colorize(:cyan)} " do
               response = delete("server/#{server[:uuid]}")
               abort "Cannot delete node #{name.colorize(:cyan)} in Upcloud" unless response[:success]
             end
 
             storage_uuids.each do |uuid|
-              spinner "Deleting Upcloud storage device '#{uuid.colorize(:cyan)}' " do
+              spinner "Deleting UpCloud storage device '#{uuid.colorize(:cyan)}' " do
                 response = delete("storage/#{uuid}")
                 unless response[:success]
-                  puts "#{"WARNING".colorize(:red)}: Couldn't delete Upcloud storage '#{uuid.colorize(:cyan)}', check manually."
+                  puts "#{"WARNING".colorize(:red)}: Couldn't delete UpCloud storage '#{uuid.colorize(:cyan)}', check manually."
                 end
               end
             end
           else
-            abort "Cannot find node #{name.colorize(:cyan)} in Upcloud"
+            abort "Cannot find node #{name.colorize(:cyan)} in UpCloud"
           end
           node = api_client.get("grids/#{grid['id']}/nodes")['nodes'].find{|n| n['name'] == name}
           if node
             spinner "Removing node #{name.colorize(:cyan)} from grid #{grid['name'].colorize(:cyan)} " do
-              api_client.delete("grids/#{grid['id']}/nodes/#{name}")
+              api_client.delete("nodes/#{grid['id']}/#{node['id']}")
             end
           end
         end

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

@@ -28,6 +28,7 @@ module Kontena
 
           abort('Invalid ssh key') unless ssh_key && ssh_key.start_with?('ssh-')
 
+          count = opts[:count].to_i
           userdata_vars = {
             version: opts[:version],
             master_uri: opts[:master_uri],
@@ -35,63 +36,68 @@ module Kontena
           }
 
           abort_unless_api_access
-          
+
           abort('CoreOS template not found on Upcloud') unless coreos_template = find_template('CoreOS Stable')
           abort('Server plan not found on Upcloud') unless plan = find_plan(opts[:plan])
           abort('Zone not found on Upcloud') unless zone_exist?(opts[:zone])
 
-          hostname = generate_name
-
-          device_data = {
-            server: {
-              zone: opts[:zone],
-              title: "Kontena Grid #{opts[:grid]} Node #{hostname}",
-              hostname: hostname,
-              plan: plan[:name],
-              vnc: 'off',
-              timezone: 'UTC',
-              user_data: user_data(userdata_vars),
-              firewall: 'off',
-              storage_devices: {
-                storage_device: [
-                  {
-                    action: 'clone',
-                    storage: coreos_template[:uuid],
-                    title: "From template #{coreos_template[:title]}",
-                    size: plan[:storage_size],
-                    tier: 'maxiops'
+          count.times do |i|
+            if opts[:name]
+              hostname = count == 1 ? opts[:name] : "#{opts[:name]}-#{i + 1}"
+            else
+              hostname = generate_name
+            end
+            device_data = {
+              server: {
+                zone: opts[:zone],
+                title: "#{opts[:grid]}/#{hostname}",
+                hostname: hostname,
+                plan: plan[:name],
+                vnc: 'off',
+                timezone: 'UTC',
+                user_data: user_data(userdata_vars),
+                firewall: 'off',
+                storage_devices: {
+                  storage_device: [
+                    {
+                      action: 'clone',
+                      storage: coreos_template[:uuid],
+                      title: "From template #{coreos_template[:title]}",
+                      size: plan[:storage_size],
+                      tier: 'maxiops'
+                    }
+                  ]
+                },
+                login_user: {
+                  create_password: 'no',
+                  username: 'root',
+                  ssh_keys: {
+                    ssh_key: [ssh_key]
                   }
-                ]
-              },
-              login_user: {
-                create_password: 'no',
-                username: 'root',
-                ssh_keys: {
-                  ssh_key: [ssh_key]
                 }
               }
-            }
-          }.to_json
+            }.to_json
 
-          spinner "Creating Upcloud node #{hostname.colorize(:cyan)} " do
-            response = post('server', body: device_data)
+            spinner "Creating UpCloud node #{hostname.colorize(:cyan)} " do
+              response = post('server', body: device_data)
 
-            if response.has_key?(:error)
-              abort("\nUpcloud server creation failed (#{response[:error].fetch(:error_message, '')})")
-            end
-            device_data = response[:server]
+              if response.has_key?(:error)
+                abort("\nUpCloud server creation failed (#{response[:error].fetch(:error_message, '')})")
+              end
+              device_data = response[:server]
 
-            until device_data && device_data.fetch(:state, nil).to_s == 'maintenance'
-              device_data = get("server/#{device[:uuid]}").fetch(:server, {}) rescue nil
-              sleep 5
+              until device_data && device_data.fetch(:state, nil).to_s == 'maintenance'
+                device_data = get("server/#{device[:uuid]}").fetch(:server, {}) rescue nil
+                sleep 5
+              end
             end
-          end
 
-          node = nil
-          spinner "Waiting for node #{hostname.colorize(:cyan)} join to grid #{opts[:grid].colorize(:cyan)} " do
-            sleep 2 until node = node_exists_in_grid?(opts[:grid], hostname)
+            node = nil
+            spinner "Waiting for node #{hostname.colorize(:cyan)} join to grid #{opts[:grid].colorize(:cyan)} " do
+              sleep 2 until node = node_exists_in_grid?(opts[:grid], hostname)
+            end
+            set_labels(node, ["region=#{opts[:zone]}", "provider=upcloud"])
           end
-          set_labels(node, ["region=#{opts[:zone]}", "provider=upcloud"])
         end
 
         def user_data(vars)
@@ -113,7 +119,7 @@ module Kontena
 
         def set_labels(node, labels)
           data = {labels: labels}
-          api_client.put("nodes/#{node['id']}", data, {}, {'Kontena-Grid-Token' => node['grid']['token']})
+          api_client.put("nodes/#{node['grid']['id']}/#{node['id']}", data)
         end
       end
     end

data/lib/kontena/machine/upcloud/node_restarter.rb

@@ -26,7 +26,7 @@ module Kontena
           server = servers[:servers][:server].find{|s| s[:hostname] == name}
 
           if server
-            spinner "Restarting Upcloud node #{name.colorize(:cyan)} " do
+            spinner "Restarting UpCloud node #{name.colorize(:cyan)} " do
               result = post(
                 "server/#{server[:uuid]}/restart", body: {
                   restart_server: {
@@ -38,11 +38,10 @@ module Kontena
               )
             end
           else
-            abort "Cannot find node #{name.colorize(:cyan)} in Upcloud"
+            abort "Cannot find node #{name.colorize(:cyan)} in UpCloud"
           end
         end
       end
     end
   end
 end
-

data/lib/kontena/plugin/upcloud.rb

@@ -1,7 +1,23 @@
 module Kontena
   module Plugin
     module Upcloud
-      VERSION = "0.2.5"
+      VERSION = "0.3.0"
+
+      ZONES = {
+        'nl-ams1' => 'Amsterdam #1',
+        'us-chi1' => 'Chicago #1',
+        'de-fra1' => 'Frankfurt #1',
+        'fi-hel1' => 'Helsinki #1',
+        'uk-lon1' => 'London #1',
+        'sg-sin1' => 'Singapore #1'
+      }.freeze
+
+      PLANS = {
+        '1xCPU-1GB' => '1024MB / 1 CPU, 30GB MaxIOPS disk, 2048GB transfer',
+        '2xCPU-2GB' => '2048MB / 2 CPU, 50GB MaxIOPS disk, 3072GB transfer',
+        '4xCPU-4GB' => '4096MB / 4 CPU, 100GB MaxIOPS disk, 4096GB transfer',
+        '6xCPU-8GB' => '8192MB / 6 CPU, 200GB MaxIOPS disk, 8192GB transfer'
+      }.freeze
     end
   end
 end

data/lib/kontena/plugin/upcloud/master/create_command.rb

@@ -5,22 +5,20 @@ module Kontena::Plugin::Upcloud::Master
     include Kontena::Cli::Common
 
     option "--name", "[NAME]", "Set Kontena Master name"
-    option "--username", "USER", "Upcloud username", required: true
-    option "--password", "PASS", "Upcloud password", required: true
-    option "--ssh-key", "SSH_KEY", "Path to ssh public key", required: true
+    option "--username", "USER", "Upcloud username", required: true, environment_variable: 'UPCLOUD_USERNAME'
+    option "--password", "PASS", "Upcloud password", required: true, environment_variable: 'UPCLOUD_PASSWORD'
+    option "--ssh-key", "SSH_KEY", "Path to ssh public key", default: '~/.ssh/id_rsa.pub'
     option "--ssl-cert", "SSL CERT", "SSL certificate file (optional)"
-    option "--plan", "PLAN", "Server plan", default: '1xCPU-1GB'
-    option "--zone", "ZONE", "Zone", default: 'fi-hel1'
+    option "--plan", "PLAN", "Server plan", required: true
+    option "--zone", "ZONE", "Zone", required: true
     option "--vault-secret", "VAULT_SECRET", "Secret key for Vault (optional)"
     option "--vault-iv", "VAULT_IV", "Initialization vector for Vault (optional)"
     option "--mongodb-uri", "URI", "External MongoDB uri (optional)"
     option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
 
     def execute
-
       require_relative '../../../machine/upcloud'
 
-      provisioner = Kontena::Machine::Upcloud::MasterProvisioner.new(username, password)
       provisioner.run!(
           name: self.name,
           ssh_key: ssh_key,
@@ -35,5 +33,32 @@ module Kontena::Plugin::Upcloud::Master
       )
     end
 
+    def provisioner
+      Kontena::Machine::Upcloud::MasterProvisioner.new(username, password)
+    end
+
+    def default_username
+      prompt.ask('UpCloud username:', echo: true)
+    end
+
+    def default_password
+      prompt.ask('UpCloud password:', echo: false)
+    end
+
+    def default_plan
+      prompt.select("Choose plan:") do |menu|
+        Kontena::Plugin::Upcloud::PLANS.each do |plan, name|
+          menu.choice name, plan
+        end
+      end
+    end
+
+    def default_zone
+      prompt.select("Choose availability zone:") do |menu|
+        Kontena::Plugin::Upcloud::ZONES.each do |zone, name|
+          menu.choice name, zone
+        end
+      end
+    end
   end
 end

data/lib/kontena/plugin/upcloud/nodes/create_command.rb

@@ -4,11 +4,12 @@ module Kontena::Plugin::Upcloud::Nodes
     include Kontena::Cli::GridOptions
 
     parameter "[NAME]", "Node name"
-    option "--username", "USER", "Upcloud username", required: true
-    option "--password", "PASS", "Upcloud password", required: true
-    option "--ssh-key", "SSH_KEY", "Path to ssh public key", required: true
-    option "--plan", "PLAN", "Server size", default: '1xCPU-1GB'
-    option "--zone", "ZONE", "Zone", default: 'fi-hel1'
+    option "--username", "USER", "Upcloud username", required: true, environment_variable: 'UPCLOUD_USERNAME'
+    option "--password", "PASS", "Upcloud password", required: true, environment_variable: 'UPCLOUD_PASSWORD'
+    option "--ssh-key", "SSH_KEY", "Path to ssh public key", default: '~/.ssh/id_rsa.pub'
+    option "--count", "COUNT", "How many nodes should be created"
+    option "--zone", "ZONE", "Zone", required: true
+    option "--plan", "PLAN", "Server size", required: true
     option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
 
     requires_current_master_token
@@ -22,6 +23,7 @@ module Kontena::Plugin::Upcloud::Nodes
         grid_token: grid['token'],
         grid: current_grid,
         ssh_key: ssh_key,
+        count: count,
         name: name,
         plan: plan,
         zone: zone,
@@ -35,5 +37,33 @@ module Kontena::Plugin::Upcloud::Nodes
       client.get("grids/#{current_grid}")
     end
 
+
+    def default_username
+      prompt.ask('UpCloud username:', echo: true)
+    end
+
+    def default_password
+      prompt.ask('UpCloud password:', echo: false)
+    end
+
+    def default_count
+      prompt.ask('How many servers:', default: 1)
+    end
+
+    def default_plan
+      prompt.select("Choose plan:") do |menu|
+        Kontena::Plugin::Upcloud::PLANS.each do |plan, name|
+          menu.choice name, plan
+        end
+      end
+    end
+
+    def default_zone
+      prompt.select("Choose availability zone:") do |menu|
+        Kontena::Plugin::Upcloud::ZONES.each do |zone, name|
+          menu.choice name, zone
+        end
+      end
+    end
   end
 end

data/lib/kontena/plugin/upcloud/nodes/restart_command.rb

@@ -4,8 +4,8 @@ module Kontena::Plugin::Upcloud::Nodes
     include Kontena::Cli::GridOptions
 
     parameter "NAME", "Node name"
-    option "--username", "USER", "Upcloud username", required: true
-    option "--password", "PASS", "Upcloud password", required: true
+    option "--username", "USER", "Upcloud username", required: true, environment_variable: 'UPCLOUD_USERNAME'
+    option "--password", "PASS", "Upcloud password", required: true, environment_variable: 'UPCLOUD_PASSWORD'
 
     def execute
       require_api_url

data/lib/kontena/plugin/upcloud/nodes/terminate_command.rb

@@ -3,9 +3,9 @@ module Kontena::Plugin::Upcloud::Nodes
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
 
-    parameter "NAME", "Node name"
-    option "--username", "USER", "Upcloud username", required: true
-    option "--password", "PASS", "Upcloud password", required: true
+    parameter "[NAME]", "Node name"
+    option "--username", "USER", "Upcloud username", required: true, environment_variable: 'UPCLOUD_USERNAME'
+    option "--password", "PASS", "Upcloud password", required: true, environment_variable: 'UPCLOUD_PASSWORD'
 
     option  '--force', :flag, "Force terminate", attribute_name: :forced
 
@@ -18,5 +18,27 @@ module Kontena::Plugin::Upcloud::Nodes
       destroyer = Kontena::Machine::Upcloud::NodeDestroyer.new(client, username, password)
       destroyer.run!(grid, name)
     end
+
+    def default_username
+      prompt.ask('UpCloud username:', echo: true)
+    end
+
+    def default_password
+      prompt.ask('UpCloud password:', echo: false)
+    end
+
+    def default_name
+      nodes = client.get("grids/#{current_grid}/nodes")
+      nodes = nodes['nodes'].select{ |n|
+        n['labels'] && n['labels'].include?('provider=upcloud'.freeze)
+      }
+      raise "Did not find any nodes with label provider=upcloud" if nodes.size == 0
+      prompt.select("Select node: ") do |menu|
+        nodes.sort_by{|n| n['node_number'] }.reverse.each do |node|
+          initial = node['initial_member'] ? '(initial) ' : ''
+          menu.choice "#{node['name']} #{initial}", node['name']
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-upcloud
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-03 00:00:00.000000000 Z
+date: 2017-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kontena-cli