awes_cli 0.0.8 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f592fb11b8a27203b8d6d688db4b7a2b89e2be17d44850a3bf0b360e09a49eb8
-  data.tar.gz: 8c98e882b6ab6b0bb4fcec1cdd84fcc9c3f152018ca2dfa4c9e026cb8adf5d55
+  metadata.gz: 45e8bc63d693bc56a8caec4132ef4247015a8dab5d5700de58ac5bfdcf2f6469
+  data.tar.gz: f59ff2761788a4cae909c66f90c260d6043ea34aea9d9c84d0f6397a9efe5ac4
 SHA512:
-  metadata.gz: 535d02115e845946e825e7ac45113de15927b4c790a8a754e222d201bdb4ae4a8d22edc0098150e9c73ec012ffb79b59de4d8ca205f060efe57d971b66d0811e
-  data.tar.gz: 504489e3f3c1ee620bd2c9fcf93217d49fda51e9d4af8342991b428fae312ac0ac2890823672ba7cdd8a3674c7af5886fceba043efdb417b8c01d5abcfe585ac
+  metadata.gz: a14dc4135709022157dab1a44e474fc6fe3d0f71c683e7c039dbdcdd433df045fbddcaa6a46b597c1547b3e686c2d21ffbfdc66b7a79a40359addcf50e2af50d
+  data.tar.gz: d8eec4b98797c893c10703c77138c0f4f3fd6dd8f846821ba5d96eb68d5835d80e123a7e2ae14ac045e32fadf8a1b1a469e909099844669b640bbc3c53a2f977

data/lib/deploy_config.rb

@@ -13,9 +13,7 @@ class DeployConfig
 
     take_approval_app_env(options)
 
-    gcr_url = "gcr.io/#{options[:project_id]}/#{options[:app_name]}"
-
-    deploy_config(gcr_url, options)
+    deploy_config(options)
   end
 
   private
@@ -36,6 +34,10 @@ class DeployConfig
           options[:image_tag] = val
         end
 
+        opts.on("--image-repo IMAGE_REPO", "Image repo to deploy [optional] default to K8s app name") do |val|
+          options[:image_repo] = val
+        end
+
         opts.on("--project-id PROJECT_ID", "GCP project id [required or set env var PROJECT_ID]") do |val|
           options[:project_id] = val
         end
@@ -139,7 +141,7 @@ class DeployConfig
       image_url
     end
 
-    def deploy_config(gcr_url, options)
+    def deploy_config(options)
       shell_cmd(
         "gcloud container clusters get-credentials #{options[:cluster]} " \
         "--region #{options[:cluster_location]} " \
@@ -157,21 +159,21 @@ class DeployConfig
         env_key = env_name[1..-1]
         env_val = override_envs[env_key] || ENV[env_key] || k8s_deployment_envs[env_key]
         next if env_val.nil?
-        yaml_file[env_name] = "'" + env_val + "'"
+        yaml_file.gsub!(env_name, "'#{env_val}'")
       end
 
-      gcr_url = "gcr.io/#{options[:project_id]}/#{options[:app_name]}"
-
-      # opt_image_url = options[:image_tag] && "#{gcr_url}:#{options[:image_tag]}"
+      gcr_url = "gcr.io/#{options[:project_id]}/#{options[:image_repo] || options[:app_name]}"
+      opt_image_url = options[:image_tag] && "#{gcr_url}:#{options[:image_tag]}"
 
-      # image_url = opt_image_url || spec[:image] || "#{gcr_url}:current"
       image_url = "#{gcr_url}:current"
+      image_url = spec[:image] if validate_image_tag_exists?(spec[:image])
+      image_url = opt_image_url if validate_image_tag_exists?(opt_image_url)
 
       if !validate_image_tag_exists?(image_url)
         build_image(image_url, gcr_url, options)
       end
 
-      yaml_file.gsub(/\$IMAGE_URL/, image_url)
+      yaml_file.gsub!(/\$IMAGE_URL/, image_url)
 
       FileUtils.mkdir_p('./tmp')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awes_cli
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.12
 platform: ruby
 authors:
 - Umar Siddiqui
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-18 00:00:00.000000000 Z
+date: 2021-08-23 00:00:00.000000000 Z
 dependencies: []
 description: Ather cli tool
 email: umar.siddiqui@atherenergy.com