krates-plugin-digitalocean 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5d71158875a5ca457d5b0829ee368ee8c148bbe1db9d2da1314ab45ad9d6a5d
-  data.tar.gz: 573c6396ba2a156497a40684715bef2dd9e9bdb105f43368bcfa713c77a2062c
+  metadata.gz: 3713fb7f9b21c95e3ca11b558af4338f3971cdfc40d61713a0d0cfbe1bd79238
+  data.tar.gz: 32485fd0fc487047a21f3c3bef6f736dded2e845a193afed9a102f7c31432187
 SHA512:
-  metadata.gz: 23f4b991201feb63189b122daf85c2de45f075f5f43187105c9a59552f98175e886686d1996da794c6e53ddeb8780bda35f9d68d7bbef71ead3bcf7e26e02f3e
-  data.tar.gz: f2691df97fc77a15e4ce041e9a2a81387bc530c6052896ba17e8d3e886ff6bde67de0c3dc1bd4242b2aa4fadbf249b1a613b7378e43f41c5f0908245399aeff0
+  metadata.gz: ffacd8be8d5005f5bb3551b04b13c9e1012a02c8806201f0886db788450d262012cb9f07d2afb37a1421dd6d6be07522302e750b243973e7cb355a1bf3774f2b
+  data.tar.gz: 77bd990f7cdb54cc0944365b1cddeaf741a9f144e22dd0d58aeef8b2e6df9fbb8d8490962eb4d203993c8409176290eab4eaad8a487784a2bd1f163cf15ab172

data/Gemfile

@@ -5,4 +5,9 @@ gemspec
 
 group :development do
   gem 'rspec'
+  gem 'pry'
+  gem 'pry-rescue'
+  gem 'pry-byebug'
+  gem 'pry-doc'
+  gem 'pry-stack_explorer'
 end

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

@@ -32,14 +32,14 @@ coreos:
       enable: true
       content: |
         [Unit]
-        Description=Kontena etcd 2.0
+        Description=Krates etcd 2.0
         After=docker.service
         After=krates-worker.service
         Requires=docker.service
         [Service]
         Restart=always
         RestartSec=5
-        ExecStart=/usr/bin/docker logs --tail=10 -f kontena-etcd
+        ExecStart=/usr/bin/docker logs --tail=10 -f krates-etcd
     - name: 50-docker.network
       mask: true
     - name: 50-docker-veth.network

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

@@ -14,7 +14,7 @@ write_files:
     owner: root
     content: | <% ssl_cert.split(/\n/).each do |row| %>
       <%= row %><% end %><% end %>
-  - path: /opt/bin/kontena-haproxy.sh
+  - path: /opt/bin/krates-haproxy.sh
     permissions: 0755
     owner: root
     content: |
@@ -24,10 +24,10 @@ write_files:
       else
         SSL_CERT="**None**"
       fi
-      /usr/bin/docker run --name=kontena-server-haproxy \
+      /usr/bin/docker run --name=krates-server-haproxy \
         --link kontena-server-api:kontena-server-api \
         -e SSL_CERT="$SSL_CERT" \
-        -p 80:80 -p 443:443 kontena/haproxy:latest
+        -p 80:80 -p 443:443 krates/haproxy:latest
 coreos:
   units:
 <% unless mongodb_uri -%>
@@ -56,19 +56,19 @@ coreos:
             mongo:3.0 mongod --smallfiles
         ExecStop=/usr/bin/docker stop kontena-server-mongo
 <% end -%>
-    - name: kontena-server-api.service
+    - name: krates-server-api.service
       command: start
       enable: true
       content: |
         [Unit]
-        Description=kontena-server-api
+        Description=krates-server-api
         After=network-online.target
         After=docker.service
         After=kontena-server-mongo.service
-        Description=Kontena Master
-        Documentation=http://www.kontena.io/
-        Before=kontena-server-haproxy.service
-        Wants=kontena-server-haproxy.service
+        Description=Krates Master
+        Documentation=https://github.com/appstersio/krates/
+        Before=krates-server-haproxy.service
+        Wants=krates-server-haproxy.service
         Requires=network-online.target
         Requires=docker.service
 <% unless mongodb_uri -%>
@@ -82,7 +82,7 @@ coreos:
         EnvironmentFile=-/etc/kontena-server.custom.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}
+        ExecStartPre=-/usr/bin/docker pull krates/master:${KONTENA_VERSION}
         ExecStart=/usr/bin/docker run --name kontena-server-api \
 <% if mongodb_uri -%>
             -e MONGODB_URI=<%= mongodb_uri %> \
@@ -97,30 +97,30 @@ coreos:
             -e INITIAL_ADMIN_CODE=<%= initial_admin_code %> \
 <% end -%>
             -e VAULT_KEY=${KONTENA_VAULT_KEY} -e VAULT_IV=${KONTENA_VAULT_IV} \
-            kontena/server:${KONTENA_VERSION}
+            krates/master:${KONTENA_VERSION}
         ExecStop=/usr/bin/docker stop kontena-server-api
 
-    - name: kontena-server-haproxy.service
+    - name: krates-server-haproxy.service
       command: start
       enable: true
       content: |
         [Unit]
-        Description=kontena-server-haproxy
+        Description=krates-server-haproxy
         After=network-online.target
         After=docker.service
-        Description=Kontena Server HAProxy
-        Documentation=http://www.kontena.io/
+        Description=Krates Server HAProxy
+        Documentation=https://github.com/appstersio/krates-haproxy
         Requires=network-online.target
         Requires=docker.service
-        Requires=kontena-server-api.service
+        Requires=krates-server-api.service
 
         [Service]
         Restart=always
         RestartSec=5
         EnvironmentFile=/etc/kontena-server.env
         EnvironmentFile=-/etc/kontena-server.custom.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
-        ExecStop=/usr/bin/docker stop kontena-server-haproxy
+        ExecStartPre=-/usr/bin/docker stop krates-server-haproxy
+        ExecStartPre=-/usr/bin/docker rm krates-server-haproxy
+        ExecStartPre=-/usr/bin/docker pull krates/haproxy:latest
+        ExecStart=/opt/bin/krates-haproxy.sh
+        ExecStop=/usr/bin/docker stop krates-server-haproxy

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

@@ -63,9 +63,7 @@ module Kontena
             sleep 0.5 until master_running?
           end
 
-          puts
-          puts "Kontena Master is now running at #{master_url}".colorize(:green)
-          puts
+          show_summary(master_url)
 
           data = {
             name: name.sub('kontena-master-', ''),
@@ -91,7 +89,14 @@ module Kontena
         end
 
         def erb(template, vars)
-          ERB.new(template, nil, '%<>-').result(OpenStruct.new(vars).instance_eval { binding })
+          # Trim mode has changed, here is how: https://redmine.ruby-lang.org/attachments/7457?utf8=✓&type=sbs
+          ERB.new(template, nil, '-').result(OpenStruct.new(vars).instance_eval { binding })
+        end
+
+        def show_summary(master_url)
+          puts
+          puts "Krates Master is now running at #{master_url}".colorize(:green)
+          puts
         end
       end
     end

data/lib/kontena/plugin/digital_ocean.rb

@@ -2,7 +2,7 @@
 module Kontena
   module Plugin
     module DigitalOcean
-      VERSION = "0.3.10"
+      VERSION = "0.3.11"
     end
   end
 end

data/lib/kontena/plugin/digital_ocean/prompts.rb

@@ -1,112 +1,120 @@
-module Kontena::Plugin::DigitalOcean::Prompts
+# Always use this form to avoid ordering/layering issues with Ruby interpeter
+# eq. module is referenced before being declared/initialized.
+module Kontena
+  module Plugin
+    module DigitalOcean
+      module Prompts
 
-  # Until DO merges https://github.com/digitalocean/resource_kit/pull/32
-  def suppress_warnings
-    @original_verbosity = $VERBOSE
-    $VERBOSE = nil
-  end
+        # Until DO merges https://github.com/digitalocean/resource_kit/pull/32
+        def suppress_warnings
+          @original_verbosity = $VERBOSE
+          $VERBOSE = nil
+        end
 
-  def resume_warnings
-    $VERBOSE = @original_verbosity
-  end
+        def resume_warnings
+          $VERBOSE = @original_verbosity
+        end
 
-  def ask_ssh_key(do_token)
-    manager = Kontena::Machine::DigitalOcean::SshKeyManager.new(do_token)
+        def ask_ssh_key(do_token)
+          manager = Kontena::Machine::DigitalOcean::SshKeyManager.new(do_token)
 
-    if self.ssh_key
-      public_key = File.read(self.ssh_key).strip
-    else
-      keys = manager.list
-      key = :new
+          if self.ssh_key
+            public_key = File.read(self.ssh_key).strip
+          else
+            keys = manager.list
+            key = :new
 
-      default_path = File.join(Dir.home, '.ssh', 'id_rsa.pub')
-      default = File.exist?(default_path) ? File.read(default_path).strip : nil
+            default_path = File.join(Dir.home, '.ssh', 'id_rsa.pub')
+            default = File.exist?(default_path) ? File.read(default_path).strip : nil
 
-      unless keys.empty?
-        key = prompt.select("Choose SSH key:") do |menu|
-          i = 1
-          keys.each do |item|
-            menu.choice "#{item.name} (#{item.fingerprint})" , item
-            menu.default i if item.public_key == default
-            i += 1
+            unless keys.empty?
+              key = prompt.select("Choose SSH key:") do |menu|
+                i = 1
+                keys.each do |item|
+                  menu.choice "#{item.name} (#{item.fingerprint})" , item
+                  menu.default i if item.public_key == default
+                  i += 1
+                end
+                menu.choice "Create new SSH key", :new
+              end
+            end
+
+            if key == :new
+
+              public_key = prompt.ask('SSH public key: (enter an ssh key in OpenSSH format "ssh-xxx xxxxx key_name")', default: default) do |q|
+                q.validate /^ssh-rsa \S+ \S+$/
+              end
+            else
+              return key.id
+            end
           end
-          menu.choice "Create new SSH key", :new
+          manager.find_or_create_by_public_key(public_key).id
         end
-      end
-
-      if key == :new
 
-        public_key = prompt.ask('SSH public key: (enter an ssh key in OpenSSH format "ssh-xxx xxxxx key_name")', default: default) do |q|
-          q.validate /^ssh-rsa \S+ \S+$/
+        def ask_do_token
+          if self.token.nil?
+            prompt.mask('DigitalOcean API token:')
+          else
+            self.token
+          end
         end
-      else
-        return key.id
-      end
-    end
-    manager.find_or_create_by_public_key(public_key).id
-  end
 
-  def ask_do_token
-    if self.token.nil?
-      prompt.mask('DigitalOcean API token:')
-    else
-      self.token
-    end
-  end
+        def ask_droplet_region(do_token)
+          if self.region.nil?
+            prompt.select("Choose a datacenter region:") do |menu|
+              do_client = DropletKit::Client.new(access_token: do_token)
+              do_client.regions.all.sort_by{|r| r.slug }.each{ |region|
+                menu.choice region.name, region.slug
+              }
+            end
+          else
+            self.region
+          end
+        end
 
-  def ask_droplet_region(do_token)
-    if self.region.nil?
-      prompt.select("Choose a datacenter region:") do |menu|
-        do_client = DropletKit::Client.new(access_token: do_token)
-        do_client.regions.all.sort_by{|r| r.slug }.each{ |region|
-          menu.choice region.name, region.slug
-        }
-      end
-    else
-      self.region
-    end
-  end
+        def ask_droplet_size(do_token, do_region)
+          if self.size.nil?
+            prompt.select("Choose droplet size:") do |menu|
+              do_client = DropletKit::Client.new(access_token: do_token)
+              do_client.sizes.all.to_a.select{ |s| s.memory > 1000 }.sort_by{|s| s.memory }.each{ |size|
+                #p size
+                if size.regions.include?(do_region)
+                  memory = size.memory.to_i / 1024
+                  menu.choice "#{size.slug}: #{memory}GB/#{size.vcpus}CPU/#{size.disk}GB ($#{size.price_monthly.to_i}/mo)", size.slug
+                end
+              }
+            end
+          else
+            self.size
+          end
+        end
 
-  def ask_droplet_size(do_token, do_region)
-    if self.size.nil?
-      prompt.select("Choose droplet size:") do |menu|
-        do_client = DropletKit::Client.new(access_token: do_token)
-        do_client.sizes.all.to_a.select{ |s| s.memory > 1000 }.sort_by{|s| s.memory }.each{ |size|
-          #p size
-          if size.regions.include?(do_region)
-            memory = size.memory.to_i / 1024
-            menu.choice "#{size.slug}: #{memory}GB/#{size.vcpus}CPU/#{size.disk}GB ($#{size.price_monthly.to_i}/mo)", size.slug
+        def ask_node(token)
+          if self.name.nil?
+            nodes = client(token).get("grids/#{current_grid}/nodes")
+            nodes = nodes['nodes'].select{ |n|
+              n['labels'] && n['labels'].include?('provider=digitalocean'.freeze)
+            }
+            raise "Did not find any nodes with label provider=digitalocean" 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
+          else
+            self.name
           end
-        }
-      end
-    else
-      self.size
-    end
-  end
+        end
 
-  def ask_node(token)
-    if self.name.nil?
-      nodes = client(token).get("grids/#{current_grid}/nodes")
-      nodes = nodes['nodes'].select{ |n|
-        n['labels'] && n['labels'].include?('provider=digitalocean'.freeze)
-      }
-      raise "Did not find any nodes with label provider=digitalocean" 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']
+        def ask_channel
+          prompt.select('Select Container Linux channel:') do |menu|
+            menu.choice 'Stable', 'stable'
+            menu.choice 'Beta', 'beta'
+            menu.choice 'Alpha', 'alpha'
+          end
         end
       end
-    else
-      self.name
-    end
-  end
-
-  def ask_channel
-    prompt.select('Select Container Linux channel:') do |menu|
-      menu.choice 'Stable', 'stable'
-      menu.choice 'Beta', 'beta'
-      menu.choice 'Alpha', 'alpha'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: krates-plugin-digitalocean
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
 platform: ruby
 authors:
 - Pavel Tsurbeleu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-10 00:00:00.000000000 Z
+date: 2020-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: krates