kontena-plugin-azure 0.1.1 → 0.2.0.pre1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTliNTI1YzY3OGRmM2E4NTA5YmI2ZjFjZGZkNjY5YmQ5MGY5ZDIwNA==
+    MWFjMDEyZmFhMzgzZGJhNDc0OWFlMjcyMzNlNGRmY2Q1ZmFhNGFlYw==
   data.tar.gz: !binary |-
-    ZTI2Y2U1YTBmOWYyOGI5NGZkODQ4MWJiZGVlYTc2MzEwZWNjZGQ4Mg==
+    MDRkOTk0YzNmYzg0ZTRhNDVlMDQwNTkzYzlkZGVmMDBlZGUwNzM1NQ==
 SHA512:
   metadata.gz: !binary |-
-    NDg0OTA3OGVlZTNlODE1YjczMmRhMDg4OTZjMTk5MjUxMGM4M2E2ODc5NTc4
-    NDNiNTZlOWQyZDRmZWI3OTc1YzI2NmIyMGEwZTk0NTMwOWY2YTQ0ZjYxNWRi
-    NGE4YmNkZGZiMTc4ODAyOGY1ZjU2YzMyMmM5YjA3M2RmMDRlZWU=
+    MjgwMTJlZjliMzkxZjVmODdhYmEwYTgzZjRiZDlmNGRlYzJlNWQ3OTlhODY3
+    OTc2ZjIyMWI0YTg1YTUzY2E3ZmQzM2Y0NDcyOWMyNDllMDhiMDQ3YTdjMDZh
+    NzgyNGRhZmYwYThhNmI1ZWM5YjgxN2ZjZDlmZDg1YWU1MGVlZmY=
   data.tar.gz: !binary |-
-    OWQ4YmE5MTg2ZjNlYWZjNDg1NDA3NThiMDhhZjA1YTRmZjY5NWU2OGE5MGVk
-    OTM2ZGNmMmUzYzZmNDE4OTBhNWIwNGZhZjcyMDI3N2FhYWFkMTA2OTliNDc2
-    MGE3YWQ2YjAyMTUwNmZmNGJmODM1OTA5YTM4NDA2ZDE2OTFmZDk=
+    NjY0NTkyMGQwYTVkMWRlMjBlNDFhZjgzYjYyNzMxYzVlZTc5ZTRlZjkzMDEx
+    OTUwNDQ3MDJhYjU5NDY4N2U5NDhiMTE0NjM1ZGY5NmIzZjc0YmJlZDAwMWNl
+    ZTgzNDEzZTEzYjYyMGE5MzQ0YmFjMTE5NTI2ZGFkZmFjY2IwMGU=

data/kontena-plugin-azure.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_runtime_dependency 'azure', '0.7.0'
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"

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

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

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

@@ -1,13 +1,13 @@
 require 'fileutils'
 require 'erb'
 require 'open3'
-require 'shell-spinner'
 
 module Kontena
   module Machine
     module Azure
       class MasterProvisioner
         include Kontena::Machine::RandomName
+        include Kontena::Cli::ShellSpinner
 
         attr_reader :client, :http_client
 
@@ -32,7 +32,7 @@ module Kontena
           cloud_service_name = generate_cloud_service_name
           vm_name = cloud_service_name
           master_url = ''
-          ShellSpinner "Creating Azure Virtual Machine #{vm_name.colorize(:cyan)}" do
+          spinner "Creating Azure Virtual Machine #{vm_name.colorize(:cyan)}" do
             if opts[:virtual_network].nil?
               location = opts[:location].downcase.gsub(' ', '-')
               default_network_name = "kontena-#{location}"
@@ -41,13 +41,10 @@ module Kontena
               opts[:subnet] = 'subnet-1'
             end
 
-            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]
-            }
+                server_name: opts[:name] || cloud_service_name.sub('kontena-master-', '')
+            )
 
             params = {
                 vm_name: vm_name,
@@ -82,12 +79,19 @@ module Kontena
           Excon.defaults[:ssl_verify_peer] = false
           @http_client = Excon.new("#{master_url}", :connect_timeout => 10)
 
-          ShellSpinner "Waiting for #{vm_name.colorize(:cyan)} to start" do
-            sleep 5 until master_running?
+          spinner "Waiting for #{vm_name.colorize(:cyan)} to start" do
+            sleep 0.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"
+          puts
+          puts "Kontena Master is now running at #{master_url}".colorize(:green)
+          puts
+
+          {
+            name: opts[:name] || cloud_service_name.sub('kontena-master-', ''),
+            public_ip: virtual_machine.ipaddress,
+            code: opts[:initial_admin_code]
+          }
         end
 
         def erb(template, vars)

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

@@ -1,4 +1,3 @@
-require 'shell-spinner'
 require 'azure/virtual_machine_image_management/virtual_machine_image_management_service'
 
 module Kontena
@@ -6,6 +5,8 @@ module Kontena
     module Azure
       class NodeDestroyer
 
+        include Kontena::Cli::ShellSpinner
+
         attr_reader :client, :api_client
 
         # @param [Kontena::Client] api_client Kontena api client
@@ -22,7 +23,7 @@ module Kontena
         end
 
         def run!(grid, name)
-          ShellSpinner "Terminating Azure Virtual Machine #{name.colorize(:cyan)} " do
+          spinner "Terminating Azure Virtual Machine #{name.colorize(:cyan)} " do
             vm = client.vm_management.get_virtual_machine(name, cloud_service_name(name, grid['name']))
             if vm
               out = StringIO.new
@@ -38,7 +39,7 @@ module Kontena
 
           node = api_client.get("grids/#{grid['id']}/nodes")['nodes'].find{|n| n['name'] == name}
           if node
-            ShellSpinner "Removing node #{name.colorize(:cyan)} from grid #{grid['name'].colorize(:cyan)} " do
+            spinner "Removing node #{name.colorize(:cyan)} from grid #{grid['name'].colorize(:cyan)} " do
               api_client.delete("grids/#{grid['id']}/nodes/#{name}")
             end
           end

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

@@ -2,13 +2,13 @@ require 'fileutils'
 require 'erb'
 require 'open3'
 require 'base64'
-require 'shell-spinner'
 
 module Kontena
   module Machine
     module Azure
       class NodeProvisioner
         include Kontena::Machine::RandomName
+        include Kontena::Cli::ShellSpinner
 
         attr_reader :client, :api_client
 
@@ -31,7 +31,7 @@ module Kontena
           vm_name = opts[:name] || generate_name
           cloud_service_name = generate_cloud_service_name(vm_name, opts[:grid])
 
-          ShellSpinner "Creating Azure Virtual Machine #{vm_name.colorize(:cyan)}" do
+          spinner "Creating Azure Virtual Machine #{vm_name.colorize(:cyan)}" do
             if opts[:virtual_network].nil?
               location = opts[:location].downcase.gsub(' ', '-')
               default_network_name = "kontena-#{location}"
@@ -68,8 +68,8 @@ module Kontena
 
             client.vm_management.create_virtual_machine(params,options)
           end
-          ShellSpinner "Waiting for node #{vm_name.colorize(:cyan)} join to grid #{opts[:grid].colorize(:cyan)} " do
-            sleep 2 until node = vm_exists_in_grid?(opts[:grid], vm_name)
+          spinner "Waiting for node #{vm_name.colorize(:cyan)} join to grid #{opts[:grid].colorize(:cyan)} " do
+            sleep 0.5 until node = vm_exists_in_grid?(opts[:grid], vm_name)
           end
           if node
             labels = [

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

@@ -4,6 +4,7 @@ module Kontena::Plugin::Azure::Master
   class CreateCommand < Kontena::Command
     include Kontena::Cli::Common
 
+    option "--name", "[NAME]", "Set Master name"
     option "--subscription-id", "SUBSCRIPTION ID", "Azure subscription id", required: true
     option "--subscription-cert", "CERTIFICATE", "Path to Azure management certificate", attribute_name: :certificate, required: true
     option "--size", "SIZE", "SIZE", default: 'Small'
@@ -14,23 +15,23 @@ module Kontena::Plugin::Azure::Master
     option "--ssl-cert", "SSL CERT", "SSL certificate file"
     option "--vault-secret", "VAULT_SECRET", "Secret key for Vault"
     option "--vault-iv", "VAULT_IV", "Initialization vector for Vault"
-    option "--auth-provider-url", "AUTH_PROVIDER_URL", "Define authentication provider url"
     option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
 
     def execute
       require 'kontena/machine/azure'
       provisioner = provisioner(subscription_id, certificate)
       provisioner.run!(
+          name: name,
           ssh_key: ssh_key,
           ssl_cert: ssl_cert,
           size: size,
           virtual_network: network,
           subnet: subnet,
           location: location,
-          auth_server: auth_provider_url,
           version: version,
           vault_secret: vault_secret || SecureRandom.hex(24),
-          vault_iv: vault_iv || SecureRandom.hex(24)
+          vault_iv: vault_iv || SecureRandom.hex(24),
+          initial_admin_code: SecureRandom.hex(16)
       )
     end
 
@@ -38,7 +39,7 @@ module Kontena::Plugin::Azure::Master
     # @param [String] certificate
     # @return [Kontena::Machine::Azure::MasterProvisioner]
     def provisioner(subscription_id, certificate)
-      Kontena::Machine::Azure::MasterProvisioner.new subscription_id, certificate
+      Kontena::Machine::Azure::MasterProvisioner.new
     end
   end
 end

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

@@ -40,7 +40,7 @@ module Kontena::Plugin::Azure::Nodes
     # @param [String] certificate
     # @return [Kontena::Machine::Azure::NodeProvisioner]
     def provisioner(client, subscription_id, certificate)
-      Kontena::Machine::Azure::NodeProvisioner.new client, subscription_id, certificate
+      Kontena::Machine::Azure::NodeProvisioner.new
     end
 
     # @return [Hash]

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

@@ -2,6 +2,7 @@ module Kontena::Plugin::Azure::Nodes
   class RestartCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
+    include Kontena::Cli::ShellSpinner
 
     parameter "NAME", "Node name"
     option "--subscription-id", "SUBSCRIPTION ID", "Azure subscription id", required: true
@@ -18,7 +19,7 @@ module Kontena::Plugin::Azure::Nodes
       client.subscription_id        = subscription_id
 
       client.vm_management.initialize_external_logger(Kontena::Machine::Azure::Logger.new) # We don't want all the output
-      ShellSpinner "Restarting Azure VM #{name.colorize(:cyan)} " do
+      spinner "Restarting Azure VM #{name.colorize(:cyan)} " do
         vm = client.vm_management.get_virtual_machine(name, "kontena-#{current_grid}-#{name}")
         if vm
           client.vm_management.restart_virtual_machine(name, "kontena-#{current_grid}-#{name}")

data/lib/kontena/plugin/azure.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-azure
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0.pre1
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-07 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: azure
   requirement: !ruby/object:Gem::Requirement
@@ -112,9 +112,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