awes_cli 0.0.20 → 0.0.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07d9a40c44ff5c9a526f11ccb81904f1c0aced7104e5c9dc8a9ab769b617f3e4
-  data.tar.gz: a252d265db0554441789cf17419d31711f5fdaf9af3507c18c67cfdad35ba4a7
+  metadata.gz: 3275174a80e5f3d18a32e2769363accdb03b48f536cf8d3d7996a0685749db23
+  data.tar.gz: ce31d146d9cbae8e71d5f804ead89707b9100f92cf3bcb4c694c1c19a4587257
 SHA512:
-  metadata.gz: ccdad37a9e690310553f3921b80f9145655ead217ce68b125a98a8d2ed8dbc918aaef27ab55e1276ca594bfdbdced4d046a227369934cf01e215d9a3ec098553
-  data.tar.gz: 5d32cc7d8c0e88d1cf19805238c2c325541b3ea5fc15f04a7826d80c2d8f8069d22b20ceda44d410511a56a3d608a6ee9e1fa7d4e57af177d72572ff8186ad2a
+  metadata.gz: bc2acf535f5e01c844584be94b967e0936a420ab5b0094b025904d8c6cf58fc32caeac7b0e6b10df1477068a33a9d2ce2b804bad4c99bb2ce0d40484d8d0fda1
+  data.tar.gz: 7047d21562e67412e82e3dbb424ee840f73e024af7eaecc34b58154d74f6a94eb495d71ea85105da318322815a5bc1e52375ad6bfc0670a35aa6b89ea6da6ed9

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 "
+    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
 
@@ -148,6 +150,8 @@ class DeployConfig
         "--project #{options[:project_id]} "
       )
 
+      self.workload_hash = fetch_worload_yaml(options[:app_name], options[:namespace])
+
       spec = app_container_spec(options[:app_name], options[:namespace]) || {}
 
       override_envs = override_envs(options)
@@ -162,11 +166,11 @@ 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 = 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)
@@ -183,7 +187,7 @@ class DeployConfig
 
       shell_cmd("kubectl apply -f ./tmp/final.yaml")
 
-      shell_cmd("kubectl rollout status deployment/#{options[:app_name]} -n #{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.20
+  version: 0.0.20.1
 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