awes_cli 0.0.23 → 0.0.24.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c56c2fd31133f9f9099a96c29b891f1cf30e206b9c4c5380e15d434037b2d9e
-  data.tar.gz: e87b7f33e19820c970ea30217cbf5d0e0e972b8428b76bcd2eeb81f572e9f1cc
+  metadata.gz: 5ef5c6e874ea89e138bafad8036d8ed8f5e31e4f5419e670c7a3357d93a49132
+  data.tar.gz: a60aa781d966c57787301c71a53052a30620de375e89c55f0482b97648cb2e7e
 SHA512:
-  metadata.gz: 31091850270124ce71745f6c5b56e93329a668c2135c1a2c2b5fbd4fdd49de76904746e5247d3e9771d5a13de8011cb2c24c6e1f2833e3d82683eddc59523c79
-  data.tar.gz: 3c6c403da51706902d567c2f000912573c4fb07188bec6d3c61490d4059ea6468552dae6e5388c505daca3994f996044228b2f414b08ed401d241ee8df5a5db2
+  metadata.gz: de14074f03f0c2a2942c3f66a106dbe96da4304f6653d0f8cfc88df7d54466e08e501c592a467aee87c916c3eb1f428efe20121d1b4366067e6219173383012d
+  data.tar.gz: f7321da9f2ee8699ee691ef021a9ea2e9306b5a7b081b30af23bf74f94ee7729729546f3d55462c6bb7f5099aee83d9e10ac061bd30d5063881f84de702380b8

data/lib/build_app_image.rb

@@ -15,10 +15,15 @@ class BuildAppImage
       options = {}
 
       require_options_keys = [:project_id, :image_repo]
+      optional_options_keys = [:cluster_location, :img_worker_pool]
 
       opt_parser = OptionParser.new do |opts|
         opts.banner = "Usage: ather build [options]"
 
+        opts.on("--img-worker-pool IMG_WORKER_POOL", "Img worker pool to build [optional]") do |val|
+          options[:img_worker_pool] = val
+        end
+        
         opts.on("--image-tag IMAGE_TAG", "Addtional Image tag to build [optional]") do |val|
           options[:image_tag] = val
         end
@@ -31,6 +36,10 @@ class BuildAppImage
           options[:image_repo] = val
         end
 
+        opts.on("--cluster-location CLUSTER_LOCATION", "App name [required or set env var CLUSTER_LOCATION]") do |val|
+          options[:cluster_location] = val
+        end
+
         opts.on("-h", "--help", "Prints this help") do
           puts opts
           exit
@@ -48,6 +57,13 @@ class BuildAppImage
         end
       end
 
+      optional_options_keys.each do |key|
+        options[key] ||= ENV[key.to_s.upcase]
+        if options[key].nil?
+          options.delete(key)
+        end
+      end
+
       options
     end
 
@@ -68,8 +84,9 @@ class BuildAppImage
       time_image_url = "#{gcr_url}:#{time_image_tag}".strip
 
       project_id = options[:project_id]
-
-      shell_cmd("gcloud builds submit --project #{project_id} --timeout=20m --tag #{time_image_url} || true")
+      worker_pool = options.key?(:img_worker_pool) && !options[:img_worker_pool].empty? ? "--worker-pool projects/#{project_id}/locations/#{options[:cluster_location]}/workerPools/#{options[:img_worker_pool]}" : ""
+      
+      shell_cmd("gcloud builds submit --project #{project_id} --timeout=20m --tag #{time_image_url} #{worker_pool} || true")
 
       shell_cmd("gcloud container images add-tag --quiet #{time_image_url} #{commit_image_url}")
 

data/lib/deploy_app.rb

@@ -10,9 +10,6 @@ class DeployApp
 
     gcr_url = "asia.gcr.io/#{options[:project_id]}/#{options[:image_repo] || options[:app_name]}"
 
-    self.workload_hash = fetch_worload_yaml(options[:app_name], options[:namespace])
-    throw "Workload does not exists name: #{option[:app_name]} namespace: #{option[:namespace]}" if workload_hash.nil?
-
     if(!options[:image_tag].nil?)
       image_url = validate_image_tag_exists?(gcr_url, options[:image_tag])
     else
@@ -27,6 +24,7 @@ class DeployApp
       options = {}
 
       require_options_keys = [:project_id, :app_name, :namespace, :cluster, :cluster_location]
+      optional_options_keys = [:img_worker_pool]
 
       opt_parser = OptionParser.new do |opts|
         opts.banner = "Usage: ather deploy app [options]"
@@ -35,6 +33,10 @@ class DeployApp
           options[:approve] = flag
         end
 
+        opts.on("--img-worker-pool IMG_WORKER_POOL", "Img worker pool to build [optional]") do |val|
+          options[:img_worker_pool] = val
+        end
+
         opts.on("--image-tag IMAGE_TAG", "Image tag to deploy [optional]") do |val|
           options[:image_tag] = val
         end
@@ -80,6 +82,13 @@ class DeployApp
         end
       end
 
+      optional_options_keys.each do |key|
+        options[key] ||= ENV[key.to_s.upcase]
+        if options[key].nil?
+          options.delete(key)
+        end
+      end
+
       options
     end
 
@@ -119,8 +128,9 @@ class DeployApp
       time_image_url = "#{gcr_url}:#{time_image_tag}".strip
 
       project_id = options[:project_id]
-
-      shell_cmd("gcloud builds submit --project #{project_id} --timeout=20m --tag #{time_image_url} || true")
+      worker_pool = options.key?(:img_worker_pool) && !options[:img_worker_pool].empty? ? "--worker-pool projects/#{project_id}/locations/#{options[:cluster_location]}/workerPools/#{options[:img_worker_pool]}" : ""
+      
+      shell_cmd("gcloud builds submit --project #{project_id} --timeout=20m --tag #{time_image_url} #{worker_pool} || true")
 
       shell_cmd("gcloud container images add-tag --quiet #{time_image_url} #{commit_image_url}")
 
@@ -134,6 +144,9 @@ class DeployApp
         "--project #{options[:project_id]} "
       )
 
+      self.workload_hash = fetch_worload_yaml(options[:app_name], options[:namespace])
+      throw "Workload does not exists name: #{options[:app_name]} namespace: #{options[:namespace]}" if workload_hash.nil?
+
       app_name = options[:app_name]
       shell_cmd("kubectl set image #{workload_hash['kind']} #{app_name} #{app_name}=#{image_url} -n #{options[:namespace]}")
 

data/lib/deploy_config.rb

@@ -24,6 +24,7 @@ class DeployConfig
       options = {}
 
       require_options_keys = [:project_id, :app_name, :namespace, :cluster, :cluster_location, :kuztomize_env]
+      optional_options_keys = [:cluster_location, :img_worker_pool]
 
       opt_parser = OptionParser.new do |opts|
         opts.banner = "Usage: ather deploy config [options]"
@@ -32,6 +33,10 @@ class DeployConfig
           options[:approve] = flag
         end
 
+        opts.on("--img-worker-pool IMG_WORKER_POOL", "Img worker pool to build [optional]") do |val|
+          options[:img_worker_pool] = val
+        end
+
         opts.on("--image-tag IMAGE_TAG", "Image tag to deploy [optional]") do |val|
           options[:image_tag] = val
         end
@@ -81,6 +86,13 @@ class DeployConfig
         end
       end
 
+      optional_options_keys.each do |key|
+        options[key] ||= ENV[key.to_s.upcase]
+        if options[key].nil?
+          options.delete(key)
+        end
+      end
+
       options
     end
 
@@ -133,8 +145,9 @@ class DeployConfig
       time_image_url = "#{gcr_url}:#{time_image_tag}".strip
 
       project_id = options[:project_id]
-
-      shell_cmd("gcloud builds submit --project #{project_id} --timeout=20m --tag #{time_image_url} || true")
+      worker_pool = options.key?(:img_worker_pool) && !options[:img_worker_pool].empty? ? "--worker-pool projects/#{project_id}/locations/#{options[:cluster_location]}/workerPools/#{options[:img_worker_pool]}" : ""
+      
+      shell_cmd("gcloud builds submit --project #{project_id} --timeout=20m --tag #{time_image_url} #{worker_pool} || true")
 
       shell_cmd("gcloud container images add-tag --quiet #{time_image_url} #{commit_image_url}")
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awes_cli
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24.1
 platform: ruby
 authors:
 - Umar Siddiqui
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-03 00:00:00.000000000 Z
+date: 2023-01-16 00:00:00.000000000 Z
 dependencies: []
 description: Ather cli tool
 email: umar.siddiqui@atherenergy.com
@@ -26,7 +26,7 @@ homepage: https://rubygems.org/gems/awes_cli
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -41,8 +41,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: Ather cli tool
 test_files: []