pfab 0.58.3 → 0.58.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06f9a7ac8980418745259dc8c9e5ecd2f42db533889b16513b61a7e141014730
-  data.tar.gz: 4d1f6a6d90830921bcaae288459e2e30c84731b9e3655464e14f0017eae6ecc7
+  metadata.gz: 9095dc3b5c4ad4e96aee6c137ecfe7700f78e9a62fb8cb88b5706bba4b32c778
+  data.tar.gz: 0bc0d39e855cd149c15f2b93c831a4468687e8be9fa3d6243da6c40efbc0f7ec
 SHA512:
-  metadata.gz: 6355ed8af48159570d12b78aabf37489d18996cdab6d62bd29c4c79a61bf9f2c0e5923704b32b466babfbf3912a52478197d083fc2693743f58e7c851b6458b1
-  data.tar.gz: 1bc9950b2904316fd6ebb18416e96e003454b87d733efaeb43fb418906c5b7b9b4b242048a8f22ec28d32861ec62494acc7c9d231dbc5cd484d136527fcbd5f8
+  metadata.gz: 31d52d5108797d2b5314a79b269187959ec38bb1093a80803deb7652d825ee882cc95baa6d1fabb5103cd8bed1db2892203a0bec2524f796838277257afde974
+  data.tar.gz: 22810edb93eee2aacc48b0d76f6dd86acd66b73c1ab56aab264a0cff36f6a960f889aeb4ff294d66ccb858caa5059075502ae176115b59cbc0a322ed97f1f5e4

data/lib/pfab/cli.rb

@@ -65,16 +65,18 @@ module Pfab
       command :shipit do |c|
         c.syntax = "pfab shipit"
         c.summary = "build, generate, apply"
-        c.option "-t", "--timeout timeout", "timeout for rollout (default 360s)"
+        c.option "-t", "--timeout TIMEOUT", Integer, "timeout for rollout (default 360s)"
+        c.option "-r", "--retries RETRIES", Integer, "number of retries for rollout (default 3)"
+        c.option "-s", "--sleep SLEEP", Integer, "sleep duration between retries in seconds (default 5)"
 
         c.action do |args, options|
-          options.default :timeout => 360
+          options.default timeout: 360, retries: 3, sleep: 5
           app_name = get_app_name(all: true)
           puts "Shipping #{app_name}"
           success = cmd_build
           if success
             cmd_generate_yaml
-            cmd_apply(timeout: options.timeout)
+            cmd_apply(timeout: options.timeout, retries: options.retries, sleep_duration: options.sleep)
           end
         end
       end
@@ -207,7 +209,7 @@ module Pfab
       run!
     end
 
-    def cmd_apply(timeout: 240)
+    def cmd_apply(timeout: 240, retries: 3, sleep_duration: 5)
       set_kube_context
       success = true
 
@@ -222,9 +224,13 @@ module Pfab
         success &= puts_and_system("git push origin --tags")
       end
 
+      success &= wait_for_deployments_rollout(timeout, retries: retries, sleep_duration: sleep_duration)
+
+      exit(success ? 0 : 1)
+    end
+
+    def wait_for_deployments_rollout(timeout, retries: 3, sleep_duration: 5)
       selector = "application=#{@application_yaml['name']}"
-      
-      # Get all deployments for the given selector
       deployment_json = `kubectl get deployment -l #{selector} -o json --namespace=#{yy.namespace}`
       deployments = JSON.parse(deployment_json)
       
@@ -232,26 +238,32 @@ module Pfab
         deployments["items"].each do |deployment|
           deployment_name = deployment["metadata"]["name"]
           puts "Waiting for deployment #{deployment_name} to roll out..."
-          rollout_success = kubectl("rollout status deployment/#{deployment_name} --timeout=#{timeout}s")
-          if rollout_success
-            puts "Deployment #{deployment_name} successfully rolled out."
-          else
-            puts "Deployment #{deployment_name} failed to roll out within the specified timeout."
+          
+          retries.times do |attempt|
+            rollout_success = kubectl("rollout status deployment/#{deployment_name} --timeout=#{timeout}s")
+            if rollout_success
+              puts "Deployment #{deployment_name} successfully rolled out. Attempt #{attempt + 1}/#{retries}."
+              break
+            else
+              puts "Attempt #{attempt + 1}/#{retries}: Deployment #{deployment_name} failed to roll out within the specified timeout."
+              if attempt < retries - 1
+                puts "Retrying in #{sleep_duration} seconds..."
+                sleep(sleep_duration)
+              end
+            end
+          end
+          
+          unless rollout_success
+            puts "Deployment #{deployment_name} failed to roll out after #{retries} attempts."
+            return false
           end
-          success &= rollout_success
         end
-      else
-        puts "No deployments found for selector: #{selector}"
-        success = false
-      end
-
-      if success
         puts "All deployments successfully rolled out."
+        true
       else
-        puts "One or more deployments failed to roll out successfully."
+        puts "No deployments found for selector: #{selector}"
+        false
       end
-
-      exit(success ? 0 : 1)
     end
 
     def image_exists?(full_image_name)

data/lib/pfab/version.rb

@@ -2,7 +2,7 @@ module Pfab
   module Version
     MAJOR = 0
     MINOR = 58
-    PATCH = 3
+    PATCH = 5
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/pfab.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: pfab 0.58.3 ruby lib
+# stub: pfab 0.58.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "pfab".freeze
-  s.version = "0.58.3"
+  s.version = "0.58.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Jeff Dwyer".freeze]
-  s.date = "2024-10-07"
+  s.date = "2024-10-09"
   s.description = "k8s helper".freeze
   s.email = "jdwyer@prefab.cloud".freeze
   s.executables = ["pfab".freeze]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pfab
 version: !ruby/object:Gem::Version
-  version: 0.58.3
+  version: 0.58.5
 platform: ruby
 authors:
 - Jeff Dwyer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-07 00:00:00.000000000 Z
+date: 2024-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander