awes_cli 0.0.19 → 0.0.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f0e4777e83a45e05f52d29479aa33d890d6a8b8dad004337d7a4c8d802ef743
-  data.tar.gz: b3bfa5071c3ef1ad26a3d86032457947f7b69e3d75deb5867a1c912fc6040949
+  metadata.gz: 317d18d4cd0256b047d9bf1df3ada8ad5fbaf0729f977fa0814a0eb3ff333bd2
+  data.tar.gz: 0c4ef3b7d8091e32a47e1da30f053332a30b9086c9ee8a9a432517509c161b10
 SHA512:
-  metadata.gz: d69f49f2f7a195f7032e0d22ecc5ffb8950f68f653e304bd1ac7695f8bdfbeed03f6c2c125199c895b72cb8d1890a7196df6292bfec31615816ab629c7ee00ff
-  data.tar.gz: 94cd29995c702077d47cdb48d9682e281c4d44dde94fd0cfa318fa4e661535fe9811372163b73381e8736b3df6cd9d0acc54cc3b0b7bfdd5fa3790f5b2c05283
+  metadata.gz: 593e57a190e46a214bddf11396638c45d4f334675a2c55a33f31d19b7a077fe8412270b38d5cb117d75e2ab1ca996a815d52bf161539262ef05b04392f86cc5c
+  data.tar.gz: 78f9aff161a12632079d62cd6c690af2744b245e77598b4930cec6fffc81f03b9edeeec133032c3d15933d37b01dd91358704521c1416a38a12eb27f3f624bc0

data/lib/build_app_image.rb

@@ -5,7 +5,7 @@ class BuildAppImage
   def main
     options = get_options
 
-    gcr_url = "gcr.io/#{options[:project_id]}/#{options[:image_repo]}"
+    gcr_url = "asia.gcr.io/#{options[:project_id]}/#{options[:image_repo]}"
 
     image_url = build_image(gcr_url, options)
   end

data/lib/deploy_app.rb

@@ -2,11 +2,13 @@
 require 'optparse'
 
 class DeployApp
+  attr_accessor :workload_hash
+
   def main
     options = get_options
     take_approval(options)
 
-    gcr_url = "gcr.io/#{options[:project_id]}/#{options[:image_repo] || options[:app_name]}"
+    gcr_url = "asia.gcr.io/#{options[:project_id]}/#{options[:image_repo] || options[:app_name]}"
 
     if(!options[:image_tag].nil?)
       image_url = validate_image_tag_exists?(gcr_url, options[:image_tag])
@@ -129,11 +131,21 @@ class DeployApp
         "--project #{options[:project_id]} "
       )
 
+      self.workload_hash = fetch_worload_yaml(options[:app_name], options[:namespace])
+
       app_name = options[:app_name]
-      shell_cmd("kubectl set image deployment #{app_name} #{app_name}=#{image_url} -n #{options[:namespace]}")
+      shell_cmd("kubectl set image #{workload_hash['kind']} #{app_name} #{app_name}=#{image_url} -n #{options[:namespace]}")
 
-      shell_cmd("kubectl rollout status deployment/#{app_name} -n #{options[:namespace]}")
+      shell_cmd("kubectl rollout status #{workload_hash['kind']} #{app_name} -n #{options[:namespace]}")
 
       shell_cmd("gcloud container images add-tag --quiet #{image_url} #{gcr_url}:current")
     end
+
+    def fetch_worload_yaml(app_name, namespace)
+      json_deploy = `kubectl get deployment -n #{namespace} #{app_name} -o json`
+      return JSON.parse(json_deploy) if(json_deploy != "")
+      json_statefulset = `kubectl get statefulset -n #{namespace} #{app_name} -o json`
+      return JSON.parse(json_statefulset) if(json_statefulset != "")
+      throw "Workload does not exists name: #{app_name} namespace: #{namespace}"
+    end
 end

data/lib/deploy_config.rb

@@ -6,6 +6,8 @@ require 'yaml'
 require 'fileutils'
 
 class DeployConfig
+  attr_accessor :workload_hash
+
   def main
     options = get_options
 
@@ -162,12 +164,12 @@ class DeployConfig
         yaml_file.gsub!(/\$#{env_key}\s*$/, "'#{env_val}'")
       end
 
-      gcr_url = "gcr.io/#{options[:project_id]}/#{options[:image_repo] || options[:app_name]}"
+      gcr_url = "asia.gcr.io/#{options[:project_id]}/#{options[:image_repo] || options[:app_name]}"
       opt_image_url = options[:image_tag] && "#{gcr_url}:#{options[:image_tag]}"
 
       image_url = "#{gcr_url}:current"
-      # image_url = spec[:image] if spec[:image].empty? && validate_image_tag_exists?(spec[:image])
-      # image_url = opt_image_url if validate_image_tag_exists?(opt_image_url)
+      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)
@@ -183,7 +185,9 @@ class DeployConfig
 
       shell_cmd("kubectl apply -f ./tmp/final.yaml")
 
-      shell_cmd("kubectl rollout status deployment/#{options[:app_name]} -n #{options[:namespace]}")
+      self.workload_hash = fetch_worload_yaml(options[:app_name], options[:namespace])
+
+      shell_cmd("kubectl rollout status #{workload_hash['kind']}/#{options[:app_name]} -n #{options[:namespace]}")
     end
 
     def override_envs(options)
@@ -215,7 +219,7 @@ class DeployConfig
     end
 
     def app_container_spec(app_name, namespace)
-      deploy_containers = `kubectl get deployment -n #{namespace} #{app_name} --output=jsonpath={.spec.template.spec.containers}`
+      deploy_containers = `kubectl get #{workload_hash['kind']} -n #{namespace} #{app_name} --output=jsonpath={.spec.template.spec.containers}`
       return nil if deploy_containers == ''
       JSON.parse(deploy_containers, symbolize_names: true).find { |container| container[:name] == app_name }
     end
@@ -229,4 +233,11 @@ class DeployConfig
 
       env_export_cmd
     end
+
+    def fetch_worload_yaml(app_name, namespace)
+      json_deploy = `kubectl get deployment -n #{namespace} #{app_name} -o json`
+      return JSON.parse(json_deploy) if(json_deploy != "")
+      json_statefulset = `kubectl get statefulset -n #{namespace} #{app_name} -o json`
+      return JSON.parse(json_statefulset) if(json_statefulset != "")
+    end
 end

metadata

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