kontena-plugin-cloud 1.2.0.pre6 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89e97e4f6267b0eaeae57d961bfac69f61729967cd24ffd5d939ff7bffd73c3d
-  data.tar.gz: bfea6af70350f035a0d5c431356e3a191b2a403d2631f28f267a3317dfcec323
+  metadata.gz: d34fa1f2bf0a29d7d5d9b689a7851414a90a0f4415471f7e574ad14e3fd3410c
+  data.tar.gz: 12490e5162d8903fe6d9379657bb72f8910cd77536489e5993d56ba48b3a8c88
 SHA512:
-  metadata.gz: 489dd9e5825b970c34a36f8811dd210b8543e398957e97d75294ad7c814bec0bcd94dd8548756b720b7032eaa2515b08cd2fdbd53ea938d6db27d01765874fb4
-  data.tar.gz: 7ba8360392b6c6266a5f16ff71834cc064a7dec941add3b6d4f1c4af55dcb66102241afe9845e0ee948b86a985cf6971e4aaf7a8aee7fe358244f4a452fa6051
+  metadata.gz: 262c61777fcb3a7e67f6567d2ab404648824d8ce0c359af8715df709c1e3cadcb993c36c917e98e874784e4c9ddbc80b4979238236d966c2ddace65fae643771
+  data.tar.gz: 3ed89bfcdff0ed24fe5f68ca03f17f4dfc116a9b8690045ddf71ec77bd4dce7691ecb40e0fdd6b537808e9d7d62101c2cac335babd50b931bb4555a6b9bbaa40

data/lib/kontena/plugin/cloud.rb

@@ -1,7 +1,7 @@
 module Kontena
   module Plugin
     module Cloud
-      VERSION = "1.2.0.pre6"
+      VERSION = "1.2.0"
 
       module Organization
         module User; end

data/lib/kontena/plugin/cloud/node/create_command.rb

@@ -59,7 +59,7 @@ class Kontena::Plugin::Cloud::Node::CreateCommand < Kontena::Command
             grid: token,
             node: node_token
           },
-          'ssh-keys': ssh_keys
+          'ssh-keys' => ssh_keys
         },
         relationships: {
           platform: {

data/lib/kontena/plugin/cloud/platform/wizard_command.rb

@@ -6,6 +6,7 @@ class Kontena::Plugin::Cloud::Platform::WizardCommand < Kontena::Command
   requires_current_account_token
 
   INFRASTRUCTURE = {
+    'cloud' => 'Kontena Cloud',
     'aws' => 'Amazon Web Services (EC2)',
     'digitalocean' => 'DigitalOcean',
     'vagrant' => 'Vagrant (with VirtualBox)'
@@ -13,6 +14,7 @@ class Kontena::Plugin::Cloud::Platform::WizardCommand < Kontena::Command
 
   parameter "[NAME]", "Platform name"
   option ['--organization', '--org'], 'ORG', 'Organization name', environment_variable: 'KONTENA_ORGANIZATION'
+  option '--type', 'TYPE', 'Platform type (mini, standard)'
   option ['--region'], 'region', 'Region (us-east-1, eu-west-1)'
   option ['--initial-size', '-i'], 'SIZE', 'Initial size (number of nodes) for platform'
   option '--version', 'VERSION', 'Platform version', visible: false
@@ -22,12 +24,18 @@ class Kontena::Plugin::Cloud::Platform::WizardCommand < Kontena::Command
 
     self.name = prompt.ask("Name:") unless self.name
     self.organization = prompt_organization unless self.organization
-    self.region = prompt_region unless self.region
-    self.initial_size = prompt_initial_size unless self.initial_size
+    self.type = prompt_type unless self.type
+    self.region = prompt_region if self.region.nil? && self.type != 'mini'
+    unless self.initial_size
+      if self.type == 'mini'
+        self.initial_size = 1
+      else
+        self.initial_size = 3
+      end
+    end
 
-    platform = nil
-    spinner "Creating platform master #{pastel.cyan(name)} to region #{pastel.cyan(region)}" do
-      platform = create_platform(name, organization, initial_size, region)
+    platform = spinner "Creating platform master #{pastel.cyan(self.name)} to region #{pastel.cyan(self.region)}" do
+      create_platform(self.name, self.organization, self.initial_size, self.region, self.type)
     end
     spinner "Waiting for platform master #{pastel.cyan(name)} to come online" do
       while !platform.online? do
@@ -44,6 +52,8 @@ class Kontena::Plugin::Cloud::Platform::WizardCommand < Kontena::Command
     end
 
     case infra
+    when 'cloud'
+      create_cloud
     when 'aws'
       create_aws
     when 'digitalocean'
@@ -67,6 +77,13 @@ class Kontena::Plugin::Cloud::Platform::WizardCommand < Kontena::Command
     end
   end
 
+  def prompt_type
+    prompt.select("Platform type:") do |menu|
+      menu.choice "standard (high-availability, business critical services)", "standard"
+      menu.choice "mini (non-business critical services)", "mini"
+    end
+  end
+
   def prompt_organization
     organizations = cloud_client.get('/organizations')['data']
     prompt.select("Choose organization:") do |menu|
@@ -85,17 +102,9 @@ class Kontena::Plugin::Cloud::Platform::WizardCommand < Kontena::Command
     end
   end
 
-  def prompt_initial_size
-    prompt.select("Initial platform size (number of nodes):") do |menu|
-      menu.choice "1 (dev/test)", 1
-      menu.choice "3 (tolerates 1 initial node failure)", 3
-      menu.choice "5 (tolerates 2 initial node failures)", 5
-    end
-  end
-
-  def create_platform(name, organization, initial_size, region)
+  def create_platform(name, organization, initial_size, region, type)
     data = {
-      attributes: { "name" => name, "initial-size" => initial_size },
+      attributes: { "name" => name, "initial-size" => initial_size, "hosted-type" => type },
       relationships: {
         region: {
           "data" => { "type" => "region", "id" => region }
@@ -107,6 +116,12 @@ class Kontena::Plugin::Cloud::Platform::WizardCommand < Kontena::Command
     Kontena::Cli::Models::Platform.new(data)
   end
 
+  def create_cloud
+    Kontena.run!([
+      'cloud', 'node', 'create', '--count', self.initial_size
+    ])
+  end
+
   def create_vagrant
     Kontena.run!([
       'vagrant', 'node', 'create', '--version', self.version, '--instances', self.initial_size

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-cloud
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre6
+  version: 1.2.0
 platform: ruby
 authors:
 - Kontena, Inc.
@@ -141,9 +141,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.2