awes_cli 0.0.22 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed029c05bdeaa99e0163aa5c2e87d9666e24b6007f1b1ce583a24dab8ba695bd
-  data.tar.gz: 7fce07a3fe1255d784255844bd4b7476fb57c2e36dab632a703ff99ba12efdc2
+  metadata.gz: e45de21aa2807bd1e0d36671b120836b878a3fc3637b87020b65c3a24ef25213
+  data.tar.gz: 5a7952c65198f19e96412253c8a03e75cde414aedfdaa455227f2740c72645de
 SHA512:
-  metadata.gz: 3f444a6751fda720334e53a5bba33a394fbbccc55686fbdd9ebe4b6d174fca3d6a4b07efd38183f691f281ea90a60ff93194cd699efd13baf1d1c481b67f0113
-  data.tar.gz: 9044707bcab97af14587cdd8e4bf996bfae89ab2769c042891afd4f4f5cd5488cecc17fb7681339840501ce6e3fabc81511667c332bfb3a37fc5fcd4587c3779
+  metadata.gz: 16b4b1c840286cd11ca5c658f28a3388a811de313f40b98c640360116ecd46f07209aa45954cd9aac1e2ede841dba4e6e3d9ec286473c9235804d9ee0ff3636b
+  data.tar.gz: 9927493efbc0938dff1d43c1dc3f994f6ab24077406f0cdd6ede2c6b9436035494f53c15c468149cff0fcb1edb3650bd9d23f56d8826fa65a30eaa678c672527

data/lib/deploy_app.rb

@@ -2,6 +2,8 @@
 require 'optparse'
 
 class DeployApp
+  attr_accessor :workload_hash
+
   def main
     options = get_options
     take_approval(options)
@@ -129,11 +131,21 @@ 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 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 != "")
+    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,7 +164,7 @@ 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"
@@ -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,8 @@ 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}`
+      return nil if workload_hash.nil?
+      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 +234,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.22
+  version: 0.0.25
 platform: ruby
 authors:
 - Umar Siddiqui
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-03 00:00:00.000000000 Z
+date: 2022-08-08 00:00:00.000000000 Z
 dependencies: []
 description: Ather cli tool
 email: umar.siddiqui@atherenergy.com