kontena-plugin-upcloud 0.1.0 → 0.2.0.pre1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTQzNDU0M2NmMjI0M2Q4M2FlYTExOTdmYTNhNTJkYjAxNjYxY2VmYg==
+    NmE3N2JkNzNjMWYwZDlhZjhjM2VmYmNiYjIzYjljNDUxMzY1Mjc0YQ==
   data.tar.gz: !binary |-
-    MjNkZTNjY2FmNThmYWMyMTM0ZjgxZTA0MmMyNGM5MWYzNzk2ZDQzMA==
+    YmEwNTgzZjBiYzE0OTkxMWFjNjJjMzJhYWI5YzhlNjJmMTg3NjBkZg==
 SHA512:
   metadata.gz: !binary |-
-    MzZjY2U2OTFiM2I3MmFkZmM2MzI2MTI5N2QyOWNjNjE2ZDY4N2I0NjA0MTQ4
-    YTE1MmY4ZjViYmQ1OTZiNjBkZjQ0ZjkxYzViNmYyMTJiNDNiZmRlYzc1MmE1
-    ZGVmYzIwMTVhNThlOGI4NTU1ZjNjOGYwZTc5M2E2YTY3MGVkMzY=
+    MTQ4MjNlNjM2Nzc2MzM4N2U4NzgyNTg0ZDgyYjYyZWVlODEzZTlmZjk4ZGU3
+    ZWVjMmNjYjNjZjk0Y2ZjYzRkYmJjN2NjZDkzMzA0ODM1NzczMzEwZWI2MjY0
+    NjQ1OWY0MTZhMjRmZGViM2ZmMGUyZDFmYzdhODg4ZmY4NDIxZDI=
   data.tar.gz: !binary |-
-    NzEyYzEyMjAyNzVmMzc4ZWY2YzdlNTM0YTc3YzgzM2MzNmI5M2RmMDVmNmY5
-    M2FlNmRhMmVmMmQzOTZmYjdlN2U0NGYxMjk3NGNmMzI0MTBjMmQwNjQzOWQy
-    ZWU3MWMxNTk3YzUwMDE3ZTIxN2U1MGRmNDcyYTVmYjk5M2UxZTk=
+    ZTk1YWQzNDc4YjIxNzEyNjY0MjZmN2Q3Y2YyMDBiY2IyZDE0OWYzYjNlNjBi
+    Y2ZjNTc5MWM3N2I3YmMzOGUwYzkzZjUzOGVhYTNhMjc2ZjhiNjIzNjM2ZmFl
+    OTUxODE0MWRiNGRmOTgwNDQ4OWRjMGI0ZDYzNTM5ODg3ZGVhZDA=

data/kontena-plugin-upcloud.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'kontena-cli', '>= 0.15.0.rc1'
+  spec.add_runtime_dependency 'kontena-cli', '>= 0.16.0.pre2'
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
 end

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

@@ -89,8 +89,11 @@ coreos:
             --link kontena-server-mongo:mongodb \
             -e MONGODB_URI=mongodb://mongodb:27017/kontena_server \
 <% end -%>
-<% if auth_server %>
-            -e AUTH_API_URL=<%= auth_server %> \
+<% if server_name %>
+            -e KONTENA_SERVER_NAME=<%= server_name %> \
+<% end -%>
+<% if initial_admin_code %>
+            -e KONTENA_INITIAL_ADMIN_CODE=<%= initial_admin_code %> \
 <% end -%>
             -e VAULT_KEY=${KONTENA_VAULT_KEY} -e VAULT_IV=${KONTENA_VAULT_IV} \
             kontena/server:${KONTENA_VERSION}

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

@@ -10,6 +10,7 @@ module Kontena
         include RandomName
         include Machine::CertHelper
         include UpcloudCommon
+        include Kontena::Cli::ShellSpinner
 
         attr_reader :http_client, :username, :password
 
@@ -30,7 +31,7 @@ module Kontena
             abort('Invalid ssl cert') unless File.exists?(File.expand_path(opts[:ssl_cert]))
             ssl_cert = File.read(File.expand_path(opts[:ssl_cert]))
           else
-            ShellSpinner "Generating self-signed SSL certificate" do
+            spinner "* Generating self-signed SSL certificate" do
               ssl_cert = generate_self_signed_cert
             end
           end
@@ -43,14 +44,10 @@ module Kontena
 
           hostname = generate_name
 
-          userdata_vars = {
+          userdata_vars = opts.merge(
               ssl_cert: ssl_cert,
-              auth_server: opts[:auth_server],
-              version: opts[:version],
-              vault_secret: opts[:vault_secret],
-              vault_iv: opts[:vault_iv],
-              mongodb_uri: opts[:mongodb_uri]
-          }
+              server_name: hostname.sub('kontena-master-', '')
+          )
 
           device_data = {
             server: {
@@ -83,7 +80,7 @@ module Kontena
             }
           }.to_json
 
-          ShellSpinner "Creating Upcloud master #{hostname.colorize(:cyan)} " do
+          spinner "* Creating Upcloud master #{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, '')})")
@@ -106,12 +103,19 @@ module Kontena
           Excon.defaults[:ssl_verify_peer] = false
           @http_client = Excon.new("#{master_url}", :connect_timeout => 10)
 
-          ShellSpinner "Waiting for #{hostname.colorize(:cyan)} to start" do
+          spinner "* Waiting for #{hostname.colorize(:cyan)} to start" do
             sleep 5 until master_running?
           end
 
-          puts "Kontena Master is now running at #{master_url}"
-          puts "Use #{"kontena login --name=#{hostname.sub('kontena-master-', '')} #{master_url}".colorize(:light_black)} to complete Kontena Master setup"
+          puts
+          puts "Kontena Master is now running at #{master_url}".colorize(:green)
+          puts
+
+          {
+            name: hostname.sub('kontena-master-', ''),
+            public_ip: device_public_ip[:address],
+            code: opts[:initial_admin_code]
+          }
         end
 
         def user_data(vars)

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

@@ -1,11 +1,10 @@
-require 'shell-spinner'
-
 module Kontena
   module Machine
     module Upcloud
       class NodeDestroyer
         include RandomName
         include UpcloudCommon
+        include Kontena::Cli::ShellSpinner
 
         attr_reader :api_client, :username, :password
 
@@ -39,7 +38,7 @@ module Kontena
 
           if server
             unless server[:state].eql?('stopped')
-              ShellSpinner "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: {

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

@@ -1,7 +1,6 @@
 require 'fileutils'
 require 'erb'
 require 'open3'
-require 'shell-spinner'
 
 module Kontena
   module Machine
@@ -9,6 +8,7 @@ module Kontena
       class NodeProvisioner
         include RandomName
         include UpcloudCommon
+        include Kontena::Cli::ShellSpinner
 
         attr_reader :api_client, :username, :password
 
@@ -73,7 +73,7 @@ module Kontena
             }
           }.to_json
 
-          ShellSpinner "Creating Upcloud node #{hostname.colorize(:cyan)} " do
+          spinner "Creating Upcloud node #{hostname.colorize(:cyan)} " do
             response = post('server', body: device_data)
 
             if response.has_key?(:error)
@@ -88,7 +88,7 @@ module Kontena
           end
 
           node = nil
-          ShellSpinner "Waiting for node #{hostname.colorize(:cyan)} join to grid #{opts[:grid].colorize(:cyan)} " do
+          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"])

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

@@ -1,11 +1,10 @@
-require 'shell-spinner'
-
 module Kontena
   module Machine
     module Upcloud
       class NodeRestarter
         include RandomName
         include UpcloudCommon
+        include Kontena::Cli::ShellSpinner
 
         attr_reader :username, :password
 
@@ -27,7 +26,7 @@ module Kontena
           server = servers[:servers][:server].find{|s| s[:hostname] == name}
 
           if server
-            ShellSpinner "Restarting Upcloud node #{name.colorize(:cyan)} " do
+            spinner "Restarting Upcloud node #{name.colorize(:cyan)} " do
               result = post(
                 "server/#{server[:uuid]}/restart", body: {
                   restart_server: {

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

@@ -3,7 +3,7 @@ require 'securerandom'
 module Kontena::Plugin::Upcloud::Master
   class CreateCommand < Clamp::Command
     include Kontena::Cli::Common
-
+    
     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
@@ -14,8 +14,6 @@ module Kontena::Plugin::Upcloud::Master
     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'
-    option "--auth-provider-url", "AUTH_PROVIDER_URL", "Define authentication provider url"
-
 
     def execute
 
@@ -28,9 +26,9 @@ module Kontena::Plugin::Upcloud::Master
           plan: plan,
           zone: zone,
           version: version,
-          auth_server: auth_provider_url,
           vault_secret: vault_secret || SecureRandom.hex(24),
           vault_iv: vault_iv || SecureRandom.hex(24),
+          initial_admin_code: SecureRandom.hex(16),
           mongodb_uri: mongodb_uri
       )
     end

data/lib/kontena/plugin/upcloud.rb

@@ -1,7 +1,7 @@
 module Kontena
   module Plugin
     module Upcloud
-      VERSION = "0.1.0"
+      VERSION = "0.2.0.pre1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-upcloud
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0.pre1
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2016-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kontena-cli
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.15.0.rc1
+        version: 0.16.0.pre2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.15.0.rc1
+        version: 0.16.0.pre2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -98,9 +98,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5