seira 0.4.5 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9c0af9106ea2d52d4e3a2a493d557fd04489313
-  data.tar.gz: 459505313598f1c5f5d0a1dabfd6816932cc4034
+  metadata.gz: 5a2029452605046f3d8f1b42deffd44ae3b85be3
+  data.tar.gz: 26e1918e974a42602e031364b024ada72e4de81a
 SHA512:
-  metadata.gz: 608eadae0937483aa564aaef66d03f95c42d183d727b80747abdf98e7aaec5f464eb1a625c9c5398bf3da0ac17801cd156cfd5acb28e0c4c6b82e8197d23c6a8
-  data.tar.gz: 3cf1f5ce2f6d60113ab9e082c61040ae675aa8d149d0abf41d6054dd47d57c80fbde7aa990cd3cb8a2099cc7cfce12b5c7ef7bc6b9fd9ecb42cdbe93354755c9
+  metadata.gz: ba5fc12eadc708b175e89d56fd835c8b4b13d0ac48415d38c5bedf524bf36ac34cc2114d6d637c1caa9a2819000cb498b742bcdb6680415ede52d7839ea67956
+  data.tar.gz: ebf13e6d47383f17589af55a17ffb1e096352cfa232b0e9c2486887ca1a3b46750cb65b744ad3407f5db24b9e3d2e8eb1c022d3f334a922a1d11cbe4a7b65c07

data/README.md

@@ -53,6 +53,7 @@ seira:
     internal:
       project: org-internal
       cluster: gke_org-internal_us-central1-a_internal
+      zone: us-central1-b
       aliases:
         - "i"
     staging:

data/lib/seira/jobs.rb

@@ -6,6 +6,26 @@ module Seira
 
     VALID_ACTIONS = %w[help list delete run].freeze
     SUMMARY = "Manage your application's jobs.".freeze
+    RESOURCE_SIZES = {
+      '1' => {
+        'CPU_REQUEST' => '200m',
+        'CPU_LIMIT' => '500m',
+        'MEMORY_REQUEST' => '500Mi',
+        'MEMORY_LIMIT' => '1Gi',
+      },
+      '2' => {
+        'CPU_REQUEST' => '1',
+        'CPU_LIMIT' => '2',
+        'MEMORY_REQUEST' => '2Gi',
+        'MEMORY_LIMIT' => '4Gi',
+      },
+      '3' => {
+        'CPU_REQUEST' => '4',
+        'CPU_LIMIT' => '6',
+        'MEMORY_REQUEST' => '10Gi',
+        'MEMORY_LIMIT' => '15Gi',
+      }
+    }.freeze
 
     attr_reader :app, :action, :args, :job_name, :context
 
@@ -54,6 +74,7 @@ module Seira
       # Set defaults
       async = false # Wait for job to finish before continuing.
       no_delete = false # Delete at end
+      resource_hash = RESOURCE_SIZES['1']
 
       # Loop through args and process any that aren't just the command to run
       loop do
@@ -70,6 +91,9 @@ module Seira
           no_delete = true
         elsif arg == '--no-delete'
           no_delete = true
+        elsif arg.start_with?('--size=')
+          size = arg.split('=')[1]
+          resource_hash = RESOURCE_SIZES[size]
         else
           puts "Warning: Unrecognized argument #{arg}"
         end
@@ -77,19 +101,14 @@ module Seira
         args.shift
       end
 
-      # TODO: Configurable CPU and memory by args such as large, small, xlarge.
       command = args.join(' ')
       unique_name = "#{app}-run-#{Random.unique_name}"
       revision = gcp_app.ask_cluster_for_current_revision # TODO: Make more reliable, especially with no web tier
       replacement_hash = {
         'UNIQUE_NAME' => unique_name,
         'REVISION' => revision,
-        'COMMAND' => %("sh", "-c", "#{command}"),
-        'CPU_REQUEST' => '200m',
-        'CPU_LIMIT' => '500m',
-        'MEMORY_REQUEST' => '500Mi',
-        'MEMORY_LIMIT' => '1Gi',
-      }
+        'COMMAND' => %("sh", "-c", "#{command}")
+      }.merge(resource_hash)
 
       source = "kubernetes/#{context[:cluster]}/#{app}" # TODO: Move to method in app.rb
       Dir.mktmpdir do |destination|

data/lib/seira/setup.rb

@@ -77,7 +77,7 @@ module Seira
       end
 
       system("gcloud config set project #{cluster_metadata['project']}")
-      system("gcloud config set compute/zone #{settings.default_zone}")
+      system("gcloud config set compute/zone #{cluster_metadata['zone'] || settings.default_zone}")
       puts "Your new gcloud setup for #{cluster_name}:"
       system("gcloud config configurations describe #{cluster_name}")
 

data/lib/seira/version.rb

@@ -1,3 +1,3 @@
 module Seira
-  VERSION = "0.4.5".freeze
+  VERSION = "0.4.7".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seira
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.7
 platform: ruby
 authors:
 - Scott Ringwelski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-07 00:00:00.000000000 Z
+date: 2018-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline